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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines