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.143 by root, Fri Aug 18 02:23:39 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_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;
254 299
255 for (y = y0; y < y0 + h; y++) 300 for (y = y0; y < y0 + h; y++)
264 if (x >= row->c0) 309 if (x >= row->c0)
265 { 310 {
266 if (x >= row->c1) 311 if (x >= row->c1)
267 break; 312 break;
268 313
269 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
270 } 315 }
271 } 316 }
272} 317}
273 318
274static void 319static void
295 ev.data2 = 0; 340 ev.data2 = 0;
296 341
297 SDL_PushEvent ((SDL_Event *)&ev); 342 SDL_PushEvent ((SDL_Event *)&ev);
298} 343}
299 344
345static unsigned int
346minpot (unsigned int n)
347{
348 if (!n)
349 return 0;
350
351 --n;
352
353 n |= n >> 1;
354 n |= n >> 2;
355 n |= n >> 4;
356 n |= n >> 8;
357 n |= n >> 16;
358
359 return n + 1;
360}
361
300MODULE = CFClient PACKAGE = CFClient 362MODULE = CFPlus PACKAGE = CFPlus
301 363
302PROTOTYPES: ENABLE 364PROTOTYPES: ENABLE
303 365
304BOOT: 366BOOT:
305{ 367{
306 HV *stash = gv_stashpv ("CFClient", 1); 368 HV *stash = gv_stashpv ("CFPlus", 1);
307 static const struct { 369 static const struct {
308 const char *name; 370 const char *name;
309 IV iv; 371 IV iv;
310 } *civ, const_iv[] = { 372 } *civ, const_iv[] = {
311# define const_iv(name) { # name, (IV)name } 373# define const_iv(name) { # name, (IV)name }
412 474
413 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 475 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415} 477}
416 478
479int
480in_destruct ()
481 CODE:
482 RETVAL = PL_main_cv == Nullcv;
483 OUTPUT:
484 RETVAL
485
486NV floor (NV x)
487
488NV ceil (NV x)
489
417void 490void
418pango_init () 491pango_init ()
419 CODE: 492 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{ 493{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 494 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 495 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); 496 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} 497}
439 498
440int 499int
441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442 501
443void 502void
444SDL_Quit () 503SDL_Quit ()
445 504
446void 505void
453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456 515
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459 518
460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464 523
465 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10)
526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif
466 529
467 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
468 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469 532
470 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
557 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559 break; 622 break;
560 } 623 }
561 624
562 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563 } 626 }
564} 627}
565 628
566int 629int
567Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 630Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
583#endif 646#endif
584 647
585void 648void
586add_font (char *file) 649add_font (char *file)
587 CODE: 650 CODE:
588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589#ifdef _WIN32
590 // cairo... sigh... requires win2000
591 AddFontResourceEx (file, FR_PRIVATE, 0);
592#endif
593 652
594void 653void
595load_image_inline (SV *image_) 654load_image_inline (SV *image_)
596 ALIAS: 655 ALIAS:
597 load_image_file = 1 656 load_image_file = 1
639 698
640 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641 700
642 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
643 702
703 SDL_LockSurface (surface2);
644 EXTEND (SP, 5); 704 EXTEND (SP, 6);
645 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
646 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
647 SDL_LockSurface (surface2);
648 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 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))); 708 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
653 712
654 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
655 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
656} 715}
657 716
693 CODE: 752 CODE:
694 fprintf (stderr, "FATAL: %s\n", message); 753 fprintf (stderr, "FATAL: %s\n", message);
695#ifdef _WIN32 754#ifdef _WIN32
696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697#endif 756#endif
698 exit (1); 757 _exit (1);
699 758
759void
760_exit (int retval)
761 CODE:
762 _exit (retval);
763
700MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
701 765
702CFClient::Font 766CFPlus::Font
703new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
704 CODE: 768 CODE:
705{ 769{
706 int count; 770 int count;
707 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
710} 774}
711 OUTPUT: 775 OUTPUT:
712 RETVAL 776 RETVAL
713 777
714void 778void
715DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
716 CODE: 780 CODE:
717 pango_font_description_free (self); 781 pango_font_description_free (self);
718 782
719void 783void
720make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
721 CODE: 785 CODE:
722 default_font = self; 786 default_font = self;
723 787
724MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
725 789
726CFClient::Layout 790void
727new (SV *class, int rgba = 0) 791reset_glyph_cache ()
728 CODE: 792 CODE:
729#if _WIN32 793 tc_clear ();
730 //rgba = 0;//D makes text nicer, breaks TextView 794
731#endif 795CFPlus::Layout
732 rgba=1;//D 796new (SV *class)
797 CODE:
733 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
734 799
735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
736 RETVAL->rgba = rgba;
737 RETVAL->r = 1.; 801 RETVAL->r = 1.;
738 RETVAL->g = 1.; 802 RETVAL->g = 1.;
739 RETVAL->b = 1.; 803 RETVAL->b = 1.;
740 RETVAL->a = 1.; 804 RETVAL->a = 1.;
741 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
745 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
746 OUTPUT: 810 OUTPUT:
747 RETVAL 811 RETVAL
748 812
749void 813void
750DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
751 CODE: 815 CODE:
752 g_object_unref (self->pl); 816 g_object_unref (self->pl);
753 Safefree (self); 817 Safefree (self);
754 818
755int
756is_rgba (CFClient::Layout self)
757 CODE:
758 RETVAL = self->rgba;
759 OUTPUT:
760 RETVAL
761
762void 819void
763set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
764 CODE: 821 CODE:
765{ 822{
766 STRLEN textlen; 823 STRLEN textlen;
767 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
768 825
769 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
770} 827}
771 828
772void 829void
773set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
774 CODE: 831 CODE:
775{ 832{
776 STRLEN textlen; 833 STRLEN textlen;
777 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
778 835
779 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
780} 837}
781 838
839void
840set_shapes (CFPlus::Layout self, ...)
841 CODE:
842{
843 PangoAttrList *attrs = 0;
844 const char *text = pango_layout_get_text (self->pl);
845 const char *pos = text;
846 int arg = 4;
847
848 while (arg < items && (pos = strstr (pos, OBJ_STR)))
849 {
850 PangoRectangle inkrect, rect;
851 PangoAttribute *attr;
852
853 int x = SvIV (ST (arg - 3));
854 int y = SvIV (ST (arg - 2));
855 int w = SvIV (ST (arg - 1));
856 int h = SvIV (ST (arg ));
857
858 inkrect.x = 0;
859 inkrect.y = 0;
860 inkrect.width = 0;
861 inkrect.height = 0;
862
863 rect.x = x * PANGO_SCALE;
864 rect.y = y * PANGO_SCALE;
865 rect.width = w * PANGO_SCALE;
866 rect.height = h * PANGO_SCALE;
867
868 if (!attrs)
869 attrs = pango_layout_get_attributes (self->pl);
870
871 attr = pango_attr_shape_new (&inkrect, &rect);
872 attr->start_index = pos - text;
873 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
874 pango_attr_list_insert (attrs, attr);
875
876 arg += 4;
877 pos += sizeof (OBJ_STR) - 1;
878 }
879
880 if (attrs)
881 pango_layout_set_attributes (self->pl, attrs);
882}
883
884void
885get_shapes (CFPlus::Layout self)
886 PPCODE:
887{
888 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
889
890 do
891 {
892 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
893
894 if (run && shape_attr_p (run))
895 {
896 PangoRectangle extents;
897 pango_layout_iter_get_run_extents (iter, 0, &extents);
898
899 EXTEND (SP, 2);
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
901 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
902 }
903 }
904 while (pango_layout_iter_next_run (iter));
905
906 pango_layout_iter_free (iter);
907}
908
909int
910has_wrapped (CFPlus::Layout self)
911 CODE:
912{
913 int lines = 1;
914 const char *text = pango_layout_get_text (self->pl);
915
916 while (*text)
917 lines += *text++ == '\n';
918
919 RETVAL = lines < pango_layout_get_line_count (self->pl);
920}
921 OUTPUT:
922 RETVAL
923
782SV * 924SV *
783get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
784 CODE: 926 CODE:
785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786 SvUTF8_on (RETVAL); 928 sv_utf8_decode (RETVAL);
787 OUTPUT: 929 OUTPUT:
788 RETVAL 930 RETVAL
789 931
790void 932void
791set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 933set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792 CODE: 934 CODE:
793 self->r = r; 935 self->r = r;
794 self->g = g; 936 self->g = g;
795 self->b = b; 937 self->b = b;
796 self->a = a; 938 self->a = a;
797 939
798void 940void
799set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800 CODE: 942 CODE:
801 if (self->font != font) 943 if (self->font != font)
802 { 944 {
803 self->font = font; 945 self->font = font;
804 layout_update_font (self); 946 layout_update_font (self);
805 } 947 }
806 948
807void 949void
808set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
809 CODE: 951 CODE:
810 if (self->base_height != base_height) 952 if (self->base_height != base_height)
811 { 953 {
812 self->base_height = base_height; 954 self->base_height = base_height;
813 layout_update_font (self); 955 layout_update_font (self);
814 } 956 }
815 957
816void 958void
817set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
818 CODE: 960 CODE:
819 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 961 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820 962
821void 963void
822set_indent (CFClient::Layout self, int indent) 964set_indent (CFPlus::Layout self, int indent)
823 CODE: 965 CODE:
824 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825 967
826void 968void
827set_spacing (CFClient::Layout self, int spacing) 969set_spacing (CFPlus::Layout self, int spacing)
828 CODE: 970 CODE:
829 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830 972
831void 973void
832set_ellipsise (CFClient::Layout self, int ellipsise) 974set_ellipsise (CFPlus::Layout self, int ellipsise)
833 CODE: 975 CODE:
834 pango_layout_set_ellipsize (self->pl, 976 pango_layout_set_ellipsize (self->pl,
835 ellipsise == 1 ? PANGO_ELLIPSIZE_START 977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
836 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
838 : PANGO_ELLIPSIZE_NONE 980 : PANGO_ELLIPSIZE_NONE
839 ); 981 );
840 982
841void 983void
842set_single_paragraph_mode (CFClient::Layout self, int spm) 984set_single_paragraph_mode (CFPlus::Layout self, int spm)
843 CODE: 985 CODE:
844 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845 987
846void 988void
847size (CFClient::Layout self) 989size (CFPlus::Layout self)
848 PPCODE: 990 PPCODE:
849{ 991{
850 int w, h; 992 int w, h;
851 993
852 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
855 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
856 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
857} 999}
858 1000
859int 1001int
1002descent (CFPlus::Layout self)
1003 CODE:
1004{
1005 PangoRectangle rect;
1006 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1007 pango_layout_line_get_pixel_extents (line, 0, &rect);
1008 RETVAL = PANGO_DESCENT (rect);
1009}
1010 OUTPUT:
1011 RETVAL
1012
1013int
860xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
861 CODE: 1015 CODE:
862{ 1016{
863 int index, trailing; 1017 int index, trailing;
864 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1018 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865 RETVAL = index; 1019 RETVAL = index;
866} 1020}
867 OUTPUT: 1021 OUTPUT:
868 RETVAL 1022 RETVAL
869 1023
870void 1024void
871cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
872 PPCODE: 1026 PPCODE:
873{ 1027{
874 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
875 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876 1030
879 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881} 1035}
882 1036
883void 1037void
884render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
885 PPCODE: 1039 PPCODE:
886{ 1040 pango_opengl_render_layout_subpixel (
887 SV *retval; 1041 self->pl,
888 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
1043 self->r, self->g, self->b, self->a,
1044 flags
1045 );
889 1046
890 layout_get_pixel_size (self, &w, &h); 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
891 1048
892 if (self->rgba) 1049void
1050pad2pot (SV *data_, SV *w_, SV *h_)
1051 CODE:
1052{
1053 int ow = SvIV (w_);
1054 int oh = SvIV (h_);
1055
1056 if (ow && oh)
893 { 1057 {
894 cairo_surface_t *surface; 1058 int nw = minpot (ow);
895 cairo_t *cairo; 1059 int nh = minpot (oh);
896 1060
897 retval = newSV (w * h * 4); 1061 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 { 1062 {
915 uint32_t *p = (uint32_t *)SvPVX (retval); 1063 if (SvOK (data_))
916 uint32_t *e = p + w * h;
917
918 while (p < e)
919 { 1064 {
920 uint32_t rgba = *p; 1065 STRLEN datalen;
921 rgba = (rgba >> 24) | (rgba << 8); 1066 char *data = SvPVbyte (data_, datalen);
922#if 0 1067 int bpp = datalen / (ow * oh);
923#ifdef _WIN32 1068 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 1069
930 rgba = (rgba & 0xffffff00) | a; 1070 SvPOK_only (result_);
1071 SvCUR_set (result_, nw * nh * bpp);
1072
1073 memset (SvPVX (result_), 0, nw * nh * bpp);
1074 while (oh--)
1075 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1076
1077 sv_setsv (data_, result_);
931 } 1078 }
932#endif 1079
933#endif 1080 sv_setiv (w_, nw);
934 rgba = SDL_SwapBE32 (rgba); 1081 sv_setiv (h_, nh);
935 *p++ = rgba;
936 } 1082 }
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 } 1083 }
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} 1084}
973 1085
974MODULE = CFClient PACKAGE = CFClient::Texture
975
976void 1086void
977draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1087draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
979 ALIAS: 1089 ALIAS:
980 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
982 CODE: 1092 CODE:
1020 glDisable (GL_ALPHA_TEST); 1130 glDisable (GL_ALPHA_TEST);
1021 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1022 } 1132 }
1023} 1133}
1024 1134
1025MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
1026 1136
1027CFClient::Map 1137CFPlus::Map
1028new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
1029 CODE: 1139 CODE:
1030 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
1031 RETVAL->x = 0; 1141 RETVAL->x = 0;
1032 RETVAL->y = 0; 1142 RETVAL->y = 0;
1042 RETVAL->row = 0; 1152 RETVAL->row = 0;
1043 OUTPUT: 1153 OUTPUT:
1044 RETVAL 1154 RETVAL
1045 1155
1046void 1156void
1047DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
1048 CODE: 1158 CODE:
1049{ 1159{
1050 map_clear (self); 1160 map_clear (self);
1051 Safefree (self->face); 1161 Safefree (self->face);
1162 Safefree (self->tex);
1052 Safefree (self); 1163 Safefree (self);
1053} 1164}
1054 1165
1055void 1166void
1056clear (CFClient::Map self) 1167clear (CFPlus::Map self)
1057 CODE: 1168 CODE:
1058 map_clear (self); 1169 map_clear (self);
1059 1170
1060void 1171void
1061set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
1062 CODE: 1173 CODE:
1063{ 1174{
1064 while (self->faces <= face) 1175 while (self->faces <= face)
1065 { 1176 {
1066 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
1069 1180
1070 self->face [face] = texid; 1181 self->face [face] = texid;
1071} 1182}
1072 1183
1073void 1184void
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) 1185set_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: 1186 CODE:
1076{ 1187{
1077 while (self->texs <= texid) 1188 while (self->texs <= texid)
1078 { 1189 {
1079 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1103 // from transparent color bleeding and ugly wrapping effects. 1214 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1215 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105} 1216}
1106 1217
1107int 1218int
1108ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1109 ALIAS: 1220 ALIAS:
1110 oy = 1 1221 oy = 1
1111 x = 2 1222 x = 2
1112 y = 3 1223 y = 3
1113 w = 4 1224 w = 4
1124 } 1235 }
1125 OUTPUT: 1236 OUTPUT:
1126 RETVAL 1237 RETVAL
1127 1238
1128void 1239void
1129scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1130 CODE: 1241 CODE:
1131{ 1242{
1132 if (dx > 0) 1243 if (dx > 0)
1133 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1134 else if (dx < 0) 1245 else if (dx < 0)
1150 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1151 } 1262 }
1152} 1263}
1153 1264
1154void 1265void
1155map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156 CODE: 1267 CODE:
1157{ 1268{
1158 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1159 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1160 mapcell *cell; 1271 mapcell *cell;
1162 1273
1163 while (data < data_end) 1274 while (data < data_end)
1164 { 1275 {
1165 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1166 1277
1167 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1168 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1169 1280
1170 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1171 1282
1172 if (flags & 15) 1283 if (flags & 15)
1173 { 1284 {
1174 if (cell->darkness < 0) 1285 if (!cell->darkness)
1175 { 1286 {
1176 cell->darkness = 0; 1287 cell->darkness = 256;
1177 cell->face [0] = 0; 1288 cell->face [0] = 0;
1178 cell->face [1] = 0; 1289 cell->face [1] = 0;
1179 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1180 } 1292 }
1181 1293
1182 cell->darkness = flags & 8 ? *data++ : 255;
1183
1184 //TODO: don't trust server data to be in-range(!) 1294 //TODO: don't trust server data to be in-range(!)
1295
1296 if (flags & 8)
1297 {
1298 if (extmap)
1299 {
1300 uint8_t ext, cmd;
1301
1302 do
1303 {
1304 ext = *data++;
1305 cmd = ext & 0x7f;
1306
1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health
1310 cell->stat_hp = *data++;
1311 }
1312 while (cmd & 0x80);
1313 }
1314 else
1315 cell->darkness = *data++ + 1;
1316 }
1185 1317
1186 if (flags & 4) 1318 if (flags & 4)
1187 { 1319 {
1188 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1320 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1189 } 1321 }
1197 { 1329 {
1198 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1330 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1199 } 1331 }
1200 } 1332 }
1201 else 1333 else
1202 cell->darkness = -1; 1334 cell->darkness = 0;
1203 } 1335 }
1204} 1336}
1205 1337
1206SV * 1338SV *
1207mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208 CODE: 1340 CODE:
1209{ 1341{
1210 int x1, x; 1342 int x1, x;
1211 int y1, y; 1343 int y1, y;
1212 int z; 1344 int z;
1262} 1394}
1263 OUTPUT: 1395 OUTPUT:
1264 RETVAL 1396 RETVAL
1265 1397
1266void 1398void
1267draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1399draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1268 PPCODE: 1400 CODE:
1269{ 1401{
1270 int vx, vy; 1402 int vx, vy;
1271 int x, y, z; 1403 int x, y, z;
1272 int last_name; 1404 int last_name;
1273 mapface face; 1405 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 1406
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; 1407 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283 vy = self->y + (self->h - sh) / 2 - shift_y; 1408 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284 1409
1285 /* 1410 /*
1286 int vx = self->vx = self->w >= sw 1411 int vx = self->vx = self->w >= sw
1287 ? self->x + (self->w - sw) / 2 1412 ? self->x + (self->w - sw) / 2
1288 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1413 : 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)); 1417 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293 */ 1418 */
1294 1419
1295 glColor4ub (255, 255, 255, 255); 1420 glColor4ub (255, 255, 255, 255);
1296 1421
1422 glEnable (GL_BLEND);
1297 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1423 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298 glEnable (GL_BLEND);
1299 glEnable (GL_TEXTURE_2D); 1424 glEnable (GL_TEXTURE_2D);
1300 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1425 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301 1426
1302 glBegin (GL_QUADS); 1427 glBegin (GL_QUADS);
1303 1428
1311 1436
1312 for (x = 0; x < sw; x++) 1437 for (x = 0; x < sw; x++)
1313 if (row->c0 <= x + vx && x + vx < row->c1) 1438 if (row->c0 <= x + vx && x + vx < row->c1)
1314 { 1439 {
1315 mapcell *cell = row->col + (x + vx - row->c0); 1440 mapcell *cell = row->col + (x + vx - row->c0);
1316
1317 darkness[y * sw4 + x] = cell->darkness < 0
1318 ? 255 - FOW_DARKNESS
1319 : 255 - cell->darkness;
1320 1441
1321 face = cell->face [z]; 1442 face = cell->face [z];
1322 1443
1323 if (face) 1444 if (face)
1324 { 1445 {
1346 glEnd (); 1467 glEnd ();
1347 1468
1348 glDisable (GL_TEXTURE_2D); 1469 glDisable (GL_TEXTURE_2D);
1349 glDisable (GL_BLEND); 1470 glDisable (GL_BLEND);
1350 1471
1472 for (y = 0; y < sh; y++)
1473 if (0 <= y + vy && y + vy < self->rows)
1474 {
1475 maprow *row = self->row + (y + vy);
1476
1477 for (x = 0; x < sw; x++)
1478 if (row->c0 <= x + vx && x + vx < row->c1)
1479 {
1480 mapcell *cell = row->col + (x + vx - row->c0);
1481
1482 int px = x * 32;
1483 int py = y * 32;
1484
1485 if (cell->stat_hp)
1486 {
1487 glColor3ub (0, 0, 0);
1488 glRectf (px + 1, py + 1, px + 31, py + 4);
1489
1490 glColor3ub (0, 255, 0);
1491 glBegin (GL_LINES);
1492 glVertex2f (px + 2, py + 2.5f);
1493 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
1494 glEnd ();
1495 }
1496 }
1497 }
1498}
1499
1500void
1501draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1502 CODE:
1503{
1504 static float color[16][3] = {
1505 { 0.00F, 0.00F, 0.00F },
1506 { 1.00F, 1.00F, 1.00F },
1507 { 0.00F, 0.00F, 0.55F },
1508 { 1.00F, 0.00F, 0.00F },
1509
1510 { 1.00F, 0.54F, 0.00F },
1511 { 0.11F, 0.56F, 1.00F },
1512 { 0.93F, 0.46F, 0.00F },
1513 { 0.18F, 0.54F, 0.34F },
1514
1515 { 0.56F, 0.73F, 0.56F },
1516 { 0.80F, 0.80F, 0.80F },
1517 { 0.55F, 0.41F, 0.13F },
1518 { 0.99F, 0.77F, 0.26F },
1519
1520 { 0.74F, 0.65F, 0.41F },
1521
1522 { 0.00F, 1.00F, 1.00F },
1523 { 1.00F, 0.00F, 1.00F },
1524 { 1.00F, 1.00F, 0.00F },
1525 };
1526
1527 int x, y;
1528
1529 glEnable (GL_TEXTURE_2D);
1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1531 glEnable (GL_BLEND);
1532 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1533 glBegin (GL_QUADS);
1534
1535 for (y = 0; y < h; y++)
1536 for (x = 0; x < w; x++)
1537 {
1538 unsigned char m = data [x + y * w];
1539
1540 if (m)
1541 {
1542 float *c = color [m & 15];
1543
1544 float tx1 = m & 0x40 ? 0.5 : 0.;
1545 float tx2 = tx1 + 0.5;
1546
1547 glColor4f (c[0], c[1], c[2], 0.75);
1548 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1549 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1550 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1551 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1552 }
1553 }
1554
1555 glEnd ();
1556 glDisable (GL_BLEND);
1557 glDisable (GL_TEXTURE_2D);
1558}
1559
1560void
1561fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1562 PPCODE:
1563{
1564 int vx, vy;
1565 int x, y;
1566 int sw4 = (sw + 3) & ~3;
1567 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1568 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1569
1570 memset (darkness, 255, sw4 * sh);
1571 SvPOK_only (darkness_sv);
1572 SvCUR_set (darkness_sv, sw4 * sh);
1573
1574 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1575 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1576
1577 for (y = 0; y < sh; y++)
1578 if (0 <= y + vy && y + vy < self->rows)
1579 {
1580 maprow *row = self->row + (y + vy);
1581
1582 for (x = 0; x < sw; x++)
1583 if (row->c0 <= x + vx && x + vx < row->c1)
1584 {
1585 mapcell *cell = row->col + (x + vx - row->c0);
1586
1587 darkness[y * sw4 + x] = cell->darkness
1588 ? 255 - (cell->darkness - 1)
1589 : 255 - FOW_DARKNESS;
1590 }
1591 }
1592
1351 EXTEND (SP, 3); 1593 EXTEND (SP, 3);
1352 PUSHs (sv_2mortal (newSViv (sw4))); 1594 PUSHs (sv_2mortal (newSViv (sw4)));
1353 PUSHs (sv_2mortal (newSViv (sh))); 1595 PUSHs (sv_2mortal (newSViv (sh)));
1354 PUSHs (darkness_sv); 1596 PUSHs (darkness_sv);
1355} 1597}
1356 1598
1357SV * 1599SV *
1358get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1600get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359 CODE: 1601 CODE:
1360{ 1602{
1361 int x, y, x1, y1; 1603 int x, y, x1, y1;
1362 SV *data_sv = newSV (w * h * 7 + 5); 1604 SV *data_sv = newSV (w * h * 7 + 5);
1363 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1605 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1425} 1667}
1426 OUTPUT: 1668 OUTPUT:
1427 RETVAL 1669 RETVAL
1428 1670
1429void 1671void
1430set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1672set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431 PPCODE: 1673 PPCODE:
1432{ 1674{
1433 int x, y, z; 1675 int x, y, z;
1434 int w, h; 1676 int w, h;
1435 int x1, y1; 1677 int x1, y1;
1467 1709
1468 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1710 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1469 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1711 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1470 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1712 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1471 1713
1472 if (cell->darkness <= 0) 1714 if (cell->darkness == 0)
1473 { 1715 {
1474 cell->darkness = -1; 1716 cell->darkness = 0;
1475 1717
1476 for (z = 0; z <= 2; z++) 1718 for (z = 0; z <= 2; z++)
1477 { 1719 {
1478 cell->face[z] = face[z]; 1720 cell->face[z] = face[z];
1479 1721
1484 } 1726 }
1485 } 1727 }
1486 } 1728 }
1487} 1729}
1488 1730
1489MODULE = CFClient PACKAGE = CFClient::MixChunk 1731MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490 1732
1491CFClient::MixChunk 1733CFPlus::MixChunk
1492new_from_file (SV *class, char *path) 1734new_from_file (SV *class, char *path)
1493 CODE: 1735 CODE:
1494 RETVAL = Mix_LoadWAV (path); 1736 RETVAL = Mix_LoadWAV (path);
1495 OUTPUT: 1737 OUTPUT:
1496 RETVAL 1738 RETVAL
1497 1739
1498void 1740void
1499DESTROY (CFClient::MixChunk self) 1741DESTROY (CFPlus::MixChunk self)
1500 CODE: 1742 CODE:
1501 Mix_FreeChunk (self); 1743 Mix_FreeChunk (self);
1502 1744
1503int 1745int
1504volume (CFClient::MixChunk self, int volume = -1) 1746volume (CFPlus::MixChunk self, int volume = -1)
1505 CODE: 1747 CODE:
1506 RETVAL = Mix_VolumeChunk (self, volume); 1748 RETVAL = Mix_VolumeChunk (self, volume);
1507 OUTPUT: 1749 OUTPUT:
1508 RETVAL 1750 RETVAL
1509 1751
1510int 1752int
1511play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1753play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512 CODE: 1754 CODE:
1513 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1755 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514 OUTPUT: 1756 OUTPUT:
1515 RETVAL 1757 RETVAL
1516 1758
1517MODULE = CFClient PACKAGE = CFClient::MixMusic 1759MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518 1760
1519int 1761int
1520volume (int volume = -1) 1762volume (int volume = -1)
1521 CODE: 1763 CODE:
1522 RETVAL = Mix_VolumeMusic (volume); 1764 RETVAL = Mix_VolumeMusic (volume);
1523 OUTPUT: 1765 OUTPUT:
1524 RETVAL 1766 RETVAL
1525 1767
1526CFClient::MixMusic 1768CFPlus::MixMusic
1527new_from_file (SV *class, char *path) 1769new_from_file (SV *class, char *path)
1528 CODE: 1770 CODE:
1529 RETVAL = Mix_LoadMUS (path); 1771 RETVAL = Mix_LoadMUS (path);
1530 OUTPUT: 1772 OUTPUT:
1531 RETVAL 1773 RETVAL
1532 1774
1533void 1775void
1534DESTROY (CFClient::MixMusic self) 1776DESTROY (CFPlus::MixMusic self)
1535 CODE: 1777 CODE:
1536 Mix_FreeMusic (self); 1778 Mix_FreeMusic (self);
1537 1779
1538int 1780int
1539play (CFClient::MixMusic self, int loops = -1) 1781play (CFPlus::MixMusic self, int loops = -1)
1540 CODE: 1782 CODE:
1541 RETVAL = Mix_PlayMusic (self, loops); 1783 RETVAL = Mix_PlayMusic (self, loops);
1542 OUTPUT: 1784 OUTPUT:
1543 RETVAL 1785 RETVAL
1544 1786
1545MODULE = CFClient PACKAGE = CFClient::OpenGL 1787MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546 1788
1547BOOT: 1789BOOT:
1548{ 1790{
1549 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1791 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550 static const struct { 1792 static const struct {
1551 const char *name; 1793 const char *name;
1552 IV iv; 1794 IV iv;
1553 } *civ, const_iv[] = { 1795 } *civ, const_iv[] = {
1554# define const_iv(name) { # name, (IV)name } 1796# define const_iv(name) { # name, (IV)name }
1561 const_iv (GL_SCISSOR_TEST), 1803 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST), 1804 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST), 1805 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE), 1806 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL), 1807 const_iv (GL_RESCALE_NORMAL),
1808 const_iv (GL_FRONT),
1809 const_iv (GL_BACK),
1566 const_iv (GL_AND), 1810 const_iv (GL_AND),
1567 const_iv (GL_ONE), 1811 const_iv (GL_ONE),
1568 const_iv (GL_ZERO), 1812 const_iv (GL_ZERO),
1569 const_iv (GL_SRC_ALPHA), 1813 const_iv (GL_SRC_ALPHA),
1570 const_iv (GL_DST_ALPHA), 1814 const_iv (GL_DST_ALPHA),
1571 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1815 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572 const_iv (GL_ONE_MINUS_DST_ALPHA), 1816 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE), 1817 const_iv (GL_SRC_ALPHA_SATURATE),
1574 const_iv (GL_RGB), 1818 const_iv (GL_RGB),
1575 const_iv (GL_RGBA), 1819 const_iv (GL_RGBA),
1820 const_iv (GL_RGBA4),
1821 const_iv (GL_RGBA8),
1822 const_iv (GL_RGB5_A1),
1576 const_iv (GL_UNSIGNED_BYTE), 1823 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT), 1824 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT), 1825 const_iv (GL_UNSIGNED_INT),
1579 const_iv (GL_ALPHA), 1826 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY), 1827 const_iv (GL_INTENSITY),
1612 const_iv (GL_SEPARABLE_2D), 1859 const_iv (GL_SEPARABLE_2D),
1613 const_iv (GL_CONVOLUTION_2D), 1860 const_iv (GL_CONVOLUTION_2D),
1614 const_iv (GL_CONVOLUTION_BORDER_MODE), 1861 const_iv (GL_CONVOLUTION_BORDER_MODE),
1615 const_iv (GL_CONSTANT_BORDER), 1862 const_iv (GL_CONSTANT_BORDER),
1616 const_iv (GL_LINES), 1863 const_iv (GL_LINES),
1864 const_iv (GL_LINE_STRIP),
1617 const_iv (GL_LINE_LOOP), 1865 const_iv (GL_LINE_LOOP),
1618 const_iv (GL_QUADS), 1866 const_iv (GL_QUADS),
1619 const_iv (GL_QUAD_STRIP), 1867 const_iv (GL_QUAD_STRIP),
1620 const_iv (GL_TRIANGLES), 1868 const_iv (GL_TRIANGLES),
1621 const_iv (GL_TRIANGLE_STRIP), 1869 const_iv (GL_TRIANGLE_STRIP),
1654 OUTPUT: 1902 OUTPUT:
1655 RETVAL 1903 RETVAL
1656 1904
1657int glGetError () 1905int glGetError ()
1658 1906
1907void glFinish ()
1908
1659void glClear (int mask) 1909void glClear (int mask)
1660 1910
1661void glClearColor (float r, float g, float b, float a = 1.0) 1911void glClearColor (float r, float g, float b, float a = 1.0)
1662 PROTOTYPE: @ 1912 PROTOTYPE: @
1663 1913
1686void glPushMatrix () 1936void glPushMatrix ()
1687 1937
1688void glPopMatrix () 1938void glPopMatrix ()
1689 1939
1690void glLoadIdentity () 1940void glLoadIdentity ()
1941
1942void glDrawBuffer (int buffer)
1943
1944void glReadBuffer (int buffer)
1691 1945
1692# near_ and far_ are due to microsofts buggy "c" compiler 1946# near_ and far_ are due to microsofts buggy "c" compiler
1693void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1947void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694 1948
1695# near_ and far_ are due to microsofts buggy "c" compiler 1949# near_ and far_ are due to microsofts buggy "c" compiler
1725 r *= a; 1979 r *= a;
1726 g *= a; 1980 g *= a;
1727 b *= a; 1981 b *= a;
1728 } 1982 }
1729 // microsoft visual "c" rounds instead of truncating... 1983 // microsoft visual "c" rounds instead of truncating...
1730 glColor4ub (MIN ((int)(r * 256.f), 255), 1984 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 1985
1735void glInterleavedArrays (int format, int stride, char *data) 1986void glInterleavedArrays (int format, int stride, char *data)
1736 1987
1737void glDrawElements (int mode, int count, int type, char *indices) 1988void glDrawElements (int mode, int count, int type, char *indices)
1738 1989
1815 2066
1816void glEndList () 2067void glEndList ()
1817 2068
1818void glCallList (int list) 2069void glCallList (int list)
1819 2070
1820

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines