ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.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);
91#ifdef FC_HINT_STYLE 126#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#endif 128#endif
94#ifdef _WIN32
95 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96#else
97 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98#endif
99} 130}
100 131
101static void 132static void
102layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
103{ 134{
104 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
105 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
106 */ 137 */
107 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
111 142
112 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
113} 144}
114 145
115static void 146static void
116layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
118 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
119 153
120 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122 156
123 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
124} 162}
125 163
126typedef uint16_t mapface; 164typedef uint16_t mapface;
127 165
128typedef struct { 166typedef struct {
131 float s, t; 169 float s, t;
132 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
133} maptex; 171} maptex;
134 172
135typedef struct { 173typedef struct {
136 int16_t darkness; 174 uint16_t darkness;
137 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
138} mapcell; 177} mapcell;
139 178
140typedef struct { 179typedef struct {
141 int32_t c0, c1; 180 int32_t c0, c1;
142 mapcell *col; 181 mapcell *col;
151 int texs; 190 int texs;
152 maptex *tex; 191 maptex *tex;
153 192
154 int32_t rows; 193 int32_t rows;
155 maprow *row; 194 maprow *row;
156} *CFClient__Map; 195} *CFPlus__Map;
157 196
158static char * 197static char *
159prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
160{ 199{
161 char *p; 200 char *p;
179 218
180#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
181#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182 221
183static maprow * 222static maprow *
184map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
185{ 224{
186 if (0 > y) 225 if (0 > y)
187 { 226 {
188 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
189 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
227 266
228 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
229} 268}
230 269
231static mapcell * 270static mapcell *
232map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
233{ 272{
234 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
235} 274}
236 275
237static void 276static void
238map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
239{ 278{
240 int r; 279 int r;
241 280
242 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
243 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
251 self->row = 0; 290 self->row = 0;
252 self->rows = 0; 291 self->rows = 0;
253} 292}
254 293
255static void 294static void
256map_blank (CFClient__Map self, int x0, int y0, int w, int h) 295map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
257{ 296{
258 int x, y; 297 int x, y;
259 maprow *row; 298 maprow *row;
260 299
261 for (y = y0; y < y0 + h; y++) 300 for (y = y0; y < y0 + h; y++)
270 if (x >= row->c0) 309 if (x >= row->c0)
271 { 310 {
272 if (x >= row->c1) 311 if (x >= row->c1)
273 break; 312 break;
274 313
275 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
276 } 315 }
277 } 316 }
278} 317}
279 318
280static void 319static void
301 ev.data2 = 0; 340 ev.data2 = 0;
302 341
303 SDL_PushEvent ((SDL_Event *)&ev); 342 SDL_PushEvent ((SDL_Event *)&ev);
304} 343}
305 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
306MODULE = CFClient PACKAGE = CFClient 362MODULE = CFPlus PACKAGE = CFPlus
307 363
308PROTOTYPES: ENABLE 364PROTOTYPES: ENABLE
309 365
310BOOT: 366BOOT:
311{ 367{
312 HV *stash = gv_stashpv ("CFClient", 1); 368 HV *stash = gv_stashpv ("CFPlus", 1);
313 static const struct { 369 static const struct {
314 const char *name; 370 const char *name;
315 IV iv; 371 IV iv;
316 } *civ, const_iv[] = { 372 } *civ, const_iv[] = {
317# define const_iv(name) { # name, (IV)name } 373# define const_iv(name) { # name, (IV)name }
418 474
419 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; )
420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
421} 477}
422 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
423void 490void
424pango_init () 491pango_init ()
425 CODE: 492 CODE:
426 // delayed, so it can pick up new fonts added by AddFontResourceEx
427{ 493{
428 {
429 ft2_fontmap = pango_ft2_font_map_new (); 494 opengl_fontmap = pango_opengl_font_map_new ();
430 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);
431 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 496 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432 }
433 {
434 cairo_font_options_t *fopt = cairo_font_options_create ();
435 cairo_fontmap = pango_cairo_font_map_get_default ();
436 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437#ifdef _WIN32
438 // cairo looks like shit eaten twice on windows
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440#else
441 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442#endif
443 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445 pango_cairo_context_set_font_options (cairo_context, fopt);
446 cairo_font_options_destroy (fopt);
447 }
448} 497}
449 498
450int 499int
451SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452 501
453void 502void
454SDL_Quit () 503SDL_Quit ()
455 504
456void 505void
463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466 515
467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469 518
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474 523
475 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
476 529
477 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
478 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479 532
480 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
567 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569 break; 622 break;
570 } 623 }
571 624
572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573 } 626 }
574} 627}
575 628
576int 629int
577Mix_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)
593#endif 646#endif
594 647
595void 648void
596add_font (char *file) 649add_font (char *file)
597 CODE: 650 CODE:
598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599#ifdef _WIN32
600 // cairo... sigh... requires win2000
601 AddFontResourceEx (file, FR_PRIVATE, 0);
602#endif
603 652
604void 653void
605load_image_inline (SV *image_) 654load_image_inline (SV *image_)
606 ALIAS: 655 ALIAS:
607 load_image_file = 1 656 load_image_file = 1
649 698
650 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651 700
652 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
653 702
703 SDL_LockSurface (surface2);
654 EXTEND (SP, 5); 704 EXTEND (SP, 6);
655 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
656 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
657 SDL_LockSurface (surface2);
658 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659 SDL_UnlockSurface (surface2);
660 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 708 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
663 712
664 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
665 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
666} 715}
667 716
703 CODE: 752 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 753 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 754#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 756#endif
708 exit (1); 757 _exit (1);
709 758
759void
760_exit (int retval)
761 CODE:
762 _exit (retval);
763
710MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
711 765
712CFClient::Font 766CFPlus::Font
713new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
714 CODE: 768 CODE:
715{ 769{
716 int count; 770 int count;
717 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
720} 774}
721 OUTPUT: 775 OUTPUT:
722 RETVAL 776 RETVAL
723 777
724void 778void
725DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
726 CODE: 780 CODE:
727 pango_font_description_free (self); 781 pango_font_description_free (self);
728 782
729void 783void
730make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
731 CODE: 785 CODE:
732 default_font = self; 786 default_font = self;
733 787
734MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
735 789
736CFClient::Layout 790void
737new (SV *class, int rgba = 0) 791reset_glyph_cache ()
792 CODE:
793 tc_clear ();
794
795CFPlus::Layout
796new (SV *class)
738 CODE: 797 CODE:
739 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
740 799
741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
742 RETVAL->rgba = rgba;
743 RETVAL->r = 1.; 801 RETVAL->r = 1.;
744 RETVAL->g = 1.; 802 RETVAL->g = 1.;
745 RETVAL->b = 1.; 803 RETVAL->b = 1.;
746 RETVAL->a = 1.; 804 RETVAL->a = 1.;
747 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
751 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
752 OUTPUT: 810 OUTPUT:
753 RETVAL 811 RETVAL
754 812
755void 813void
756DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
757 CODE: 815 CODE:
758 g_object_unref (self->pl); 816 g_object_unref (self->pl);
759 Safefree (self); 817 Safefree (self);
760 818
761int
762is_rgba (CFClient::Layout self)
763 CODE:
764 RETVAL = self->rgba;
765 OUTPUT:
766 RETVAL
767
768void 819void
769set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
770 CODE: 821 CODE:
771{ 822{
772 STRLEN textlen; 823 STRLEN textlen;
773 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
774 825
775 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
776} 827}
777 828
778void 829void
779set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
780 CODE: 831 CODE:
781{ 832{
782 STRLEN textlen; 833 STRLEN textlen;
783 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
784 835
785 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
786} 837}
787 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
788SV * 924SV *
789get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
790 CODE: 926 CODE:
791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792 sv_utf8_decode (RETVAL); 928 sv_utf8_decode (RETVAL);
793 OUTPUT: 929 OUTPUT:
794 RETVAL 930 RETVAL
795 931
796void 932void
797set_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.)
798 CODE: 934 CODE:
799 self->r = r; 935 self->r = r;
800 self->g = g; 936 self->g = g;
801 self->b = b; 937 self->b = b;
802 self->a = a; 938 self->a = a;
803 939
804void 940void
805set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806 CODE: 942 CODE:
807 if (self->font != font) 943 if (self->font != font)
808 { 944 {
809 self->font = font; 945 self->font = font;
810 layout_update_font (self); 946 layout_update_font (self);
811 } 947 }
812 948
813void 949void
814set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
815 CODE: 951 CODE:
816 if (self->base_height != base_height) 952 if (self->base_height != base_height)
817 { 953 {
818 self->base_height = base_height; 954 self->base_height = base_height;
819 layout_update_font (self); 955 layout_update_font (self);
820 } 956 }
821 957
822void 958void
823set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
824 CODE: 960 CODE:
825 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);
826 962
827void 963void
828set_indent (CFClient::Layout self, int indent) 964set_indent (CFPlus::Layout self, int indent)
829 CODE: 965 CODE:
830 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831 967
832void 968void
833set_spacing (CFClient::Layout self, int spacing) 969set_spacing (CFPlus::Layout self, int spacing)
834 CODE: 970 CODE:
835 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836 972
837void 973void
838set_ellipsise (CFClient::Layout self, int ellipsise) 974set_ellipsise (CFPlus::Layout self, int ellipsise)
839 CODE: 975 CODE:
840 pango_layout_set_ellipsize (self->pl, 976 pango_layout_set_ellipsize (self->pl,
841 ellipsise == 1 ? PANGO_ELLIPSIZE_START 977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
842 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
844 : PANGO_ELLIPSIZE_NONE 980 : PANGO_ELLIPSIZE_NONE
845 ); 981 );
846 982
847void 983void
848set_single_paragraph_mode (CFClient::Layout self, int spm) 984set_single_paragraph_mode (CFPlus::Layout self, int spm)
849 CODE: 985 CODE:
850 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851 987
852void 988void
853size (CFClient::Layout self) 989size (CFPlus::Layout self)
854 PPCODE: 990 PPCODE:
855{ 991{
856 int w, h; 992 int w, h;
857 993
858 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
861 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
862 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
863} 999}
864 1000
865int 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
866xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
867 CODE: 1015 CODE:
868{ 1016{
869 int index, trailing; 1017 int index, trailing;
870 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);
871 RETVAL = index; 1019 RETVAL = index;
872} 1020}
873 OUTPUT: 1021 OUTPUT:
874 RETVAL 1022 RETVAL
875 1023
876void 1024void
877cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
878 PPCODE: 1026 PPCODE:
879{ 1027{
880 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
881 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882 1030
885 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887} 1035}
888 1036
889void 1037void
890render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
891 PPCODE: 1039 PPCODE:
892{ 1040 pango_opengl_render_layout_subpixel (
893 SV *retval; 1041 self->pl,
894 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
1043 self->r, self->g, self->b, self->a,
1044 flags
1045 );
895 1046
896 layout_get_pixel_size (self, &w, &h); 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
897 1048
898 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)
899 { 1057 {
900 cairo_surface_t *surface; 1058 int nw = minpot (ow);
901 cairo_t *cairo; 1059 int nh = minpot (oh);
902 1060
903 retval = newSV (w * h * 4); 1061 if (nw != ow || nh != oh)
904 SvPOK_only (retval);
905 SvCUR_set (retval, w * h * 4);
906
907 memset (SvPVX (retval), 0, w * h * 4);
908
909 surface = cairo_image_surface_create_for_data (
910 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911 cairo = cairo_create (surface);
912 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914 pango_cairo_show_layout (cairo, self->pl);
915
916 cairo_destroy (cairo);
917 cairo_surface_destroy (surface);
918
919 // what a mess, and its premultiplied, too :(
920 { 1062 {
921 uint32_t *p = (uint32_t *)SvPVX (retval); 1063 if (SvOK (data_))
922 uint32_t *e = p + w * h;
923
924 while (p < e)
925 { 1064 {
926 uint32_t rgba = *p; 1065 STRLEN datalen;
927 rgba = (rgba >> 24) | (rgba << 8); 1066 char *data = SvPVbyte (data_, datalen);
928#if 0 1067 int bpp = datalen / (ow * oh);
929#ifdef _WIN32 1068 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
930 {//D
931 uint8_t r = rgba >> 24;
932 uint8_t g = rgba >> 16;
933 uint8_t b = rgba >> 8;
934 uint8_t a = rgba >> 0;
935 1069
936 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_);
937 } 1078 }
938#endif 1079
939#endif 1080 sv_setiv (w_, nw);
940 rgba = SDL_SwapBE32 (rgba); 1081 sv_setiv (h_, nh);
941 *p++ = rgba;
942 } 1082 }
943 }
944
945 EXTEND (SP, 5);
946 PUSHs (sv_2mortal (newSViv (w)));
947 PUSHs (sv_2mortal (newSViv (h)));
948 PUSHs (sv_2mortal (retval));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951 } 1083 }
952 else
953 {
954 FT_Bitmap bitmap;
955
956 retval = newSV (w * h);
957 SvPOK_only (retval);
958 SvCUR_set (retval, w * h);
959
960 bitmap.rows = h;
961 bitmap.width = w;
962 bitmap.pitch = w;
963 bitmap.buffer = (unsigned char*)SvPVX (retval);
964 bitmap.num_grays = 256;
965 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967 memset (bitmap.buffer, 0, w * h);
968
969 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971 EXTEND (SP, 5);
972 PUSHs (sv_2mortal (newSViv (w)));
973 PUSHs (sv_2mortal (newSViv (h)));
974 PUSHs (sv_2mortal (retval));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977 }
978} 1084}
979 1085
980MODULE = CFClient PACKAGE = CFClient::Texture
981
982void 1086void
983draw_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.)
984 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
985 ALIAS: 1089 ALIAS:
986 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
988 CODE: 1092 CODE:
1026 glDisable (GL_ALPHA_TEST); 1130 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1028 } 1132 }
1029} 1133}
1030 1134
1031MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1136
1033CFClient::Map 1137CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
1035 CODE: 1139 CODE:
1036 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1141 RETVAL->x = 0;
1038 RETVAL->y = 0; 1142 RETVAL->y = 0;
1048 RETVAL->row = 0; 1152 RETVAL->row = 0;
1049 OUTPUT: 1153 OUTPUT:
1050 RETVAL 1154 RETVAL
1051 1155
1052void 1156void
1053DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
1054 CODE: 1158 CODE:
1055{ 1159{
1056 map_clear (self); 1160 map_clear (self);
1057 Safefree (self->face); 1161 Safefree (self->face);
1162 Safefree (self->tex);
1058 Safefree (self); 1163 Safefree (self);
1059} 1164}
1060 1165
1061void 1166void
1062clear (CFClient::Map self) 1167clear (CFPlus::Map self)
1063 CODE: 1168 CODE:
1064 map_clear (self); 1169 map_clear (self);
1065 1170
1066void 1171void
1067set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
1068 CODE: 1173 CODE:
1069{ 1174{
1070 while (self->faces <= face) 1175 while (self->faces <= face)
1071 { 1176 {
1072 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
1075 1180
1076 self->face [face] = texid; 1181 self->face [face] = texid;
1077} 1182}
1078 1183
1079void 1184void
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1081 CODE: 1186 CODE:
1082{ 1187{
1083 while (self->texs <= texid) 1188 while (self->texs <= texid)
1084 { 1189 {
1085 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1109 // from transparent color bleeding and ugly wrapping effects. 1214 // from transparent color bleeding and ugly wrapping effects.
1110 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1215 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111} 1216}
1112 1217
1113int 1218int
1114ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1115 ALIAS: 1220 ALIAS:
1116 oy = 1 1221 oy = 1
1117 x = 2 1222 x = 2
1118 y = 3 1223 y = 3
1119 w = 4 1224 w = 4
1130 } 1235 }
1131 OUTPUT: 1236 OUTPUT:
1132 RETVAL 1237 RETVAL
1133 1238
1134void 1239void
1135scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1136 CODE: 1241 CODE:
1137{ 1242{
1138 if (dx > 0) 1243 if (dx > 0)
1139 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1140 else if (dx < 0) 1245 else if (dx < 0)
1156 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1157 } 1262 }
1158} 1263}
1159 1264
1160void 1265void
1161map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162 CODE: 1267 CODE:
1163{ 1268{
1164 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1166 mapcell *cell; 1271 mapcell *cell;
1168 1273
1169 while (data < data_end) 1274 while (data < data_end)
1170 { 1275 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1172 1277
1173 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1175 1280
1176 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1177 1282
1178 if (flags & 15) 1283 if (flags & 15)
1179 { 1284 {
1180 if (cell->darkness < 0) 1285 if (!cell->darkness)
1181 { 1286 {
1182 cell->darkness = 0; 1287 cell->darkness = 256;
1183 cell->face [0] = 0; 1288 cell->face [0] = 0;
1184 cell->face [1] = 0; 1289 cell->face [1] = 0;
1185 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1186 } 1292 }
1187 1293
1188 cell->darkness = flags & 8 ? *data++ : 255;
1189
1190 //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 }
1191 1317
1192 if (flags & 4) 1318 if (flags & 4)
1193 { 1319 {
1194 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;
1195 } 1321 }
1203 { 1329 {
1204 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;
1205 } 1331 }
1206 } 1332 }
1207 else 1333 else
1208 cell->darkness = -1; 1334 cell->darkness = 0;
1209 } 1335 }
1210} 1336}
1211 1337
1212SV * 1338SV *
1213mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214 CODE: 1340 CODE:
1215{ 1341{
1216 int x1, x; 1342 int x1, x;
1217 int y1, y; 1343 int y1, y;
1218 int z; 1344 int z;
1268} 1394}
1269 OUTPUT: 1395 OUTPUT:
1270 RETVAL 1396 RETVAL
1271 1397
1272void 1398void
1273draw (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)
1274 PPCODE: 1400 CODE:
1275{ 1401{
1276 int vx, vy; 1402 int vx, vy;
1277 int x, y, z; 1403 int x, y, z;
1278 int last_name; 1404 int last_name;
1279 mapface face; 1405 mapface face;
1280 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1406
1284 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh);
1287
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1407 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1408 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1290 1409
1291 /* 1410 /*
1292 int vx = self->vx = self->w >= sw 1411 int vx = self->vx = self->w >= sw
1293 ? self->x + (self->w - sw) / 2 1412 ? self->x + (self->w - sw) / 2
1294 : 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));
1298 : 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));
1299 */ 1418 */
1300 1419
1301 glColor4ub (255, 255, 255, 255); 1420 glColor4ub (255, 255, 255, 255);
1302 1421
1422 glEnable (GL_BLEND);
1303 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1423 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304 glEnable (GL_BLEND);
1305 glEnable (GL_TEXTURE_2D); 1424 glEnable (GL_TEXTURE_2D);
1306 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1425 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307 1426
1308 glBegin (GL_QUADS); 1427 glBegin (GL_QUADS);
1309 1428
1317 1436
1318 for (x = 0; x < sw; x++) 1437 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1438 if (row->c0 <= x + vx && x + vx < row->c1)
1320 { 1439 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1440 mapcell *cell = row->col + (x + vx - row->c0);
1322
1323 darkness[y * sw4 + x] = cell->darkness < 0
1324 ? 255 - FOW_DARKNESS
1325 : 255 - cell->darkness;
1326 1441
1327 face = cell->face [z]; 1442 face = cell->face [z];
1328 1443
1329 if (face) 1444 if (face)
1330 { 1445 {
1352 glEnd (); 1467 glEnd ();
1353 1468
1354 glDisable (GL_TEXTURE_2D); 1469 glDisable (GL_TEXTURE_2D);
1355 glDisable (GL_BLEND); 1470 glDisable (GL_BLEND);
1356 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
1357 EXTEND (SP, 3); 1593 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1594 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1595 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1596 PUSHs (darkness_sv);
1361} 1597}
1362 1598
1363SV * 1599SV *
1364get_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)
1365 CODE: 1601 CODE:
1366{ 1602{
1367 int x, y, x1, y1; 1603 int x, y, x1, y1;
1368 SV *data_sv = newSV (w * h * 7 + 5); 1604 SV *data_sv = newSV (w * h * 7 + 5);
1369 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1605 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1431} 1667}
1432 OUTPUT: 1668 OUTPUT:
1433 RETVAL 1669 RETVAL
1434 1670
1435void 1671void
1436set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1672set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437 PPCODE: 1673 PPCODE:
1438{ 1674{
1439 int x, y, z; 1675 int x, y, z;
1440 int w, h; 1676 int w, h;
1441 int x1, y1; 1677 int x1, y1;
1473 1709
1474 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1710 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1711 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1712 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477 1713
1478 if (cell->darkness <= 0) 1714 if (cell->darkness == 0)
1479 { 1715 {
1480 cell->darkness = -1; 1716 cell->darkness = 0;
1481 1717
1482 for (z = 0; z <= 2; z++) 1718 for (z = 0; z <= 2; z++)
1483 { 1719 {
1484 cell->face[z] = face[z]; 1720 cell->face[z] = face[z];
1485 1721
1490 } 1726 }
1491 } 1727 }
1492 } 1728 }
1493} 1729}
1494 1730
1495MODULE = CFClient PACKAGE = CFClient::MixChunk 1731MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496 1732
1497CFClient::MixChunk 1733CFPlus::MixChunk
1498new_from_file (SV *class, char *path) 1734new_from_file (SV *class, char *path)
1499 CODE: 1735 CODE:
1500 RETVAL = Mix_LoadWAV (path); 1736 RETVAL = Mix_LoadWAV (path);
1501 OUTPUT: 1737 OUTPUT:
1502 RETVAL 1738 RETVAL
1503 1739
1504void 1740void
1505DESTROY (CFClient::MixChunk self) 1741DESTROY (CFPlus::MixChunk self)
1506 CODE: 1742 CODE:
1507 Mix_FreeChunk (self); 1743 Mix_FreeChunk (self);
1508 1744
1509int 1745int
1510volume (CFClient::MixChunk self, int volume = -1) 1746volume (CFPlus::MixChunk self, int volume = -1)
1511 CODE: 1747 CODE:
1512 RETVAL = Mix_VolumeChunk (self, volume); 1748 RETVAL = Mix_VolumeChunk (self, volume);
1513 OUTPUT: 1749 OUTPUT:
1514 RETVAL 1750 RETVAL
1515 1751
1516int 1752int
1517play (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)
1518 CODE: 1754 CODE:
1519 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1755 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520 OUTPUT: 1756 OUTPUT:
1521 RETVAL 1757 RETVAL
1522 1758
1523MODULE = CFClient PACKAGE = CFClient::MixMusic 1759MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524 1760
1525int 1761int
1526volume (int volume = -1) 1762volume (int volume = -1)
1527 CODE: 1763 CODE:
1528 RETVAL = Mix_VolumeMusic (volume); 1764 RETVAL = Mix_VolumeMusic (volume);
1529 OUTPUT: 1765 OUTPUT:
1530 RETVAL 1766 RETVAL
1531 1767
1532CFClient::MixMusic 1768CFPlus::MixMusic
1533new_from_file (SV *class, char *path) 1769new_from_file (SV *class, char *path)
1534 CODE: 1770 CODE:
1535 RETVAL = Mix_LoadMUS (path); 1771 RETVAL = Mix_LoadMUS (path);
1536 OUTPUT: 1772 OUTPUT:
1537 RETVAL 1773 RETVAL
1538 1774
1539void 1775void
1540DESTROY (CFClient::MixMusic self) 1776DESTROY (CFPlus::MixMusic self)
1541 CODE: 1777 CODE:
1542 Mix_FreeMusic (self); 1778 Mix_FreeMusic (self);
1543 1779
1544int 1780int
1545play (CFClient::MixMusic self, int loops = -1) 1781play (CFPlus::MixMusic self, int loops = -1)
1546 CODE: 1782 CODE:
1547 RETVAL = Mix_PlayMusic (self, loops); 1783 RETVAL = Mix_PlayMusic (self, loops);
1548 OUTPUT: 1784 OUTPUT:
1549 RETVAL 1785 RETVAL
1550 1786
1551MODULE = CFClient PACKAGE = CFClient::OpenGL 1787MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552 1788
1553BOOT: 1789BOOT:
1554{ 1790{
1555 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1791 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556 static const struct { 1792 static const struct {
1557 const char *name; 1793 const char *name;
1558 IV iv; 1794 IV iv;
1559 } *civ, const_iv[] = { 1795 } *civ, const_iv[] = {
1560# define const_iv(name) { # name, (IV)name } 1796# define const_iv(name) { # name, (IV)name }
1567 const_iv (GL_SCISSOR_TEST), 1803 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 1804 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 1805 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 1806 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 1807 const_iv (GL_RESCALE_NORMAL),
1808 const_iv (GL_FRONT),
1809 const_iv (GL_BACK),
1572 const_iv (GL_AND), 1810 const_iv (GL_AND),
1573 const_iv (GL_ONE), 1811 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 1812 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 1813 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 1814 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1815 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 1816 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 1817 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 1818 const_iv (GL_RGB),
1581 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),
1582 const_iv (GL_UNSIGNED_BYTE), 1823 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 1824 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 1825 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 1826 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 1827 const_iv (GL_INTENSITY),
1618 const_iv (GL_SEPARABLE_2D), 1859 const_iv (GL_SEPARABLE_2D),
1619 const_iv (GL_CONVOLUTION_2D), 1860 const_iv (GL_CONVOLUTION_2D),
1620 const_iv (GL_CONVOLUTION_BORDER_MODE), 1861 const_iv (GL_CONVOLUTION_BORDER_MODE),
1621 const_iv (GL_CONSTANT_BORDER), 1862 const_iv (GL_CONSTANT_BORDER),
1622 const_iv (GL_LINES), 1863 const_iv (GL_LINES),
1864 const_iv (GL_LINE_STRIP),
1623 const_iv (GL_LINE_LOOP), 1865 const_iv (GL_LINE_LOOP),
1624 const_iv (GL_QUADS), 1866 const_iv (GL_QUADS),
1625 const_iv (GL_QUAD_STRIP), 1867 const_iv (GL_QUAD_STRIP),
1626 const_iv (GL_TRIANGLES), 1868 const_iv (GL_TRIANGLES),
1627 const_iv (GL_TRIANGLE_STRIP), 1869 const_iv (GL_TRIANGLE_STRIP),
1660 OUTPUT: 1902 OUTPUT:
1661 RETVAL 1903 RETVAL
1662 1904
1663int glGetError () 1905int glGetError ()
1664 1906
1907void glFinish ()
1908
1665void glClear (int mask) 1909void glClear (int mask)
1666 1910
1667void glClearColor (float r, float g, float b, float a = 1.0) 1911void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 1912 PROTOTYPE: @
1669 1913
1692void glPushMatrix () 1936void glPushMatrix ()
1693 1937
1694void glPopMatrix () 1938void glPopMatrix ()
1695 1939
1696void glLoadIdentity () 1940void glLoadIdentity ()
1941
1942void glDrawBuffer (int buffer)
1943
1944void glReadBuffer (int buffer)
1697 1945
1698# near_ and far_ are due to microsofts buggy "c" compiler 1946# near_ and far_ are due to microsofts buggy "c" compiler
1699void 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_)
1700 1948
1701# near_ and far_ are due to microsofts buggy "c" compiler 1949# near_ and far_ are due to microsofts buggy "c" compiler
1731 r *= a; 1979 r *= a;
1732 g *= a; 1980 g *= a;
1733 b *= a; 1981 b *= a;
1734 } 1982 }
1735 // microsoft visual "c" rounds instead of truncating... 1983 // microsoft visual "c" rounds instead of truncating...
1736 glColor4ub (MIN ((int)(r * 256.f), 255), 1984 glColor4f (r, g, b, a);
1737 MIN ((int)(g * 256.f), 255),
1738 MIN ((int)(b * 256.f), 255),
1739 MIN ((int)(a * 256.f), 255));
1740 1985
1741void glInterleavedArrays (int format, int stride, char *data) 1986void glInterleavedArrays (int format, int stride, char *data)
1742 1987
1743void glDrawElements (int mode, int count, int type, char *indices) 1988void glDrawElements (int mode, int count, int type, char *indices)
1744 1989
1821 2066
1822void glEndList () 2067void glEndList ()
1823 2068
1824void glCallList (int list) 2069void glCallList (int list)
1825 2070
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines