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.115 by root, Wed Jun 14 18:59:30 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 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>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
14
15#ifdef _WIN32
16# undef pipe
17#endif
11 18
12#include <math.h> 19#include <math.h>
13#include <string.h> 20#include <string.h>
14#include <stdio.h> 21#include <stdio.h>
15#include <stdlib.h> 22#include <stdlib.h>
18#include <SDL_endian.h> 25#include <SDL_endian.h>
19#include <SDL_image.h> 26#include <SDL_image.h>
20#include <SDL_mixer.h> 27#include <SDL_mixer.h>
21#include <SDL_opengl.h> 28#include <SDL_opengl.h>
22 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
23#include <glib/gmacros.h> 33#include <glib/gmacros.h>
24 34
25#include <pango/pango.h> 35#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 36
30#ifndef _WIN32 37#ifndef _WIN32
31# include <sys/types.h> 38# include <sys/types.h>
32# include <sys/socket.h> 39# include <sys/socket.h>
33# include <netinet/in.h> 40# include <netinet/in.h>
34# include <netinet/tcp.h> 41# include <netinet/tcp.h>
35# include <inttypes.h> 42# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 43#endif
44 44
45#include "glext.h" 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 46
47#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
48 48
49#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
51 51
52#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
53
54#if 0
55# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else
57# define PARACHUTE 0
58#endif
53 59
54static struct 60static struct
55{ 61{
56#define GL_FUNC(ptr,name) ptr name; 62#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 63#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 72 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 73 else
68 glBlendFunc (sa, da); 74 glBlendFunc (sa, da);
69} 75}
70 76
77#include "texcache.c"
78
79#include "pango-font.c"
80#include "pango-fontmap.c"
81#include "pango-render.c"
82
71typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
73 85
74typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
87
88static int
89shape_attr_p (PangoLayoutRun *run)
90{
91 GSList *attrs = run->item->analysis.extra_attrs;
92
93 while (attrs)
94 {
95 PangoAttribute *attr = attrs->data;
96
97 if (attr->klass->type == PANGO_ATTR_SHAPE)
98 return 1;
99
100 attrs = attrs->next;
101 }
102
103 return 0;
104}
75 105
76typedef struct cf_layout { 106typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 107 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
80 int base_height; 109 int base_height;
81 CFClient__Font font; 110 CFPlus__Font font;
82} *CFClient__Layout; 111} *CFPlus__Layout;
83 112
84static CFClient__Font default_font; 113static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
87 116
88static void 117static void
89substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
90{ 119{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 121#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 123#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 125}
101 126
102static void 127static void
103layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
104{ 129{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 130 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
107 */ 132 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
112 137
113 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
114} 139}
115 140
116static void 141static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
120 148
121 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 151
124 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
125} 157}
126 158
127typedef uint16_t mapface; 159typedef uint16_t mapface;
128 160
129typedef struct { 161typedef struct {
132 float s, t; 164 float s, t;
133 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
134} maptex; 166} maptex;
135 167
136typedef struct { 168typedef struct {
137 int16_t darkness; 169 uint32_t player;
138 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
139} mapcell; 173} mapcell;
140 174
141typedef struct { 175typedef struct {
142 int32_t c0, c1; 176 int32_t c0, c1;
143 mapcell *col; 177 mapcell *col;
152 int texs; 186 int texs;
153 maptex *tex; 187 maptex *tex;
154 188
155 int32_t rows; 189 int32_t rows;
156 maprow *row; 190 maprow *row;
157} *CFClient__Map; 191} *CFPlus__Map;
158 192
159static char * 193static char *
160prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
161{ 195{
162 char *p; 196 char *p;
180 214
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 217
184static maprow * 218static maprow *
185map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
186{ 220{
187 if (0 > y) 221 if (0 > y)
188 { 222 {
189 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
228 262
229 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
230} 264}
231 265
232static mapcell * 266static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
234{ 268{
235 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
236} 270}
237 271
238static void 272static void
239map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
240{ 274{
241 int r; 275 int r;
242 276
243 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
252 self->row = 0; 286 self->row = 0;
253 self->rows = 0; 287 self->rows = 0;
254} 288}
255 289
256static void 290static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 292{
259 int x, y; 293 int x, y;
260 maprow *row; 294 maprow *row;
295 mapcell *cell;
261 296
262 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 298 if (y >= 0)
264 { 299 {
265 if (y >= self->rows) 300 if (y >= self->rows)
271 if (x >= row->c0) 306 if (x >= row->c0)
272 { 307 {
273 if (x >= row->c1) 308 if (x >= row->c1)
274 break; 309 break;
275 310
276 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
277 } 317 }
278 } 318 }
279} 319}
280 320
281static void 321static void
319 n |= n >> 16; 359 n |= n >> 16;
320 360
321 return n + 1; 361 return n + 1;
322} 362}
323 363
324MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
325 365
326PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
327 367
328BOOT: 368BOOT:
329{ 369{
330 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 371 static const struct {
332 const char *name; 372 const char *name;
333 IV iv; 373 IV iv;
334 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
436 476
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439} 479}
440 480
481int
482in_destruct ()
483 CODE:
484 RETVAL = PL_main_cv == Nullcv;
485 OUTPUT:
486 RETVAL
487
488NV floor (NV x)
489
490NV ceil (NV x)
491
441void 492void
442pango_init () 493pango_init ()
443 CODE: 494 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 495{
446 {
447 ft2_fontmap = pango_ft2_font_map_new (); 496 opengl_fontmap = pango_opengl_font_map_new ();
448 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 497 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 498 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
453 cairo_fontmap = pango_cairo_font_map_get_default ();
454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
466} 499}
467 500
468int 501int
469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470 503
471void 504void
472SDL_Quit () 505SDL_Quit ()
473 506
474void 507void
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492 525
493 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
494 531
495 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497 534
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 624 break;
588 } 625 }
589 626
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 628 }
592} 629}
593 630
594int 631int
595Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 632Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
609#ifndef _WIN32 646#ifndef _WIN32
610 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
611#endif 648#endif
612 649
613void 650void
651win32_proxy_info ()
652 PPCODE:
653{
654#ifdef _WIN32
655 char buffer[2048];
656 DWORD buflen;
657
658 EXTEND (SP, 3);
659
660 buflen = sizeof (buffer);
661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
678
679void
614add_font (char *file) 680add_font (char *file)
615 CODE: 681 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 683
622void 684void
623load_image_inline (SV *image_) 685load_image_inline (SV *image_)
624 ALIAS: 686 ALIAS:
625 load_image_file = 1 687 load_image_file = 1
667 729
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 731
670 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
671 733
734 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 735 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677 SDL_UnlockSurface (surface2);
678 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA8 : GL_RGB8))); 739 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
681 743
682 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
684} 746}
685 747
724 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
725#endif 787#endif
726 _exit (1); 788 _exit (1);
727 789
728void 790void
729_exit (int retval) 791_exit (int retval = 0)
730 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
731 _exit (retval); 796 _exit (retval);
797#endif
732 798
733MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
734 800
735CFClient::Font 801CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
737 CODE: 803 CODE:
738{ 804{
739 int count; 805 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 809}
744 OUTPUT: 810 OUTPUT:
745 RETVAL 811 RETVAL
746 812
747void 813void
748DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
749 CODE: 815 CODE:
750 pango_font_description_free (self); 816 pango_font_description_free (self);
751 817
752void 818void
753make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
754 CODE: 820 CODE:
755 default_font = self; 821 default_font = self;
756 822
757MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
758 824
759CFClient::Layout 825void
760new (SV *class, int rgba = 0) 826reset_glyph_cache ()
827 CODE:
828 tc_clear ();
829
830CFPlus::Layout
831new (SV *class)
761 CODE: 832 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
763 834
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 836 RETVAL->r = 1.;
767 RETVAL->g = 1.; 837 RETVAL->g = 1.;
768 RETVAL->b = 1.; 838 RETVAL->b = 1.;
769 RETVAL->a = 1.; 839 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 840 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
775 OUTPUT: 845 OUTPUT:
776 RETVAL 846 RETVAL
777 847
778void 848void
779DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
780 CODE: 850 CODE:
781 g_object_unref (self->pl); 851 g_object_unref (self->pl);
782 Safefree (self); 852 Safefree (self);
783 853
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
791void 854void
792set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
793 CODE: 856 CODE:
794{ 857{
795 STRLEN textlen; 858 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
797 860
798 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
799} 862}
800 863
801void 864void
802set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
803 CODE: 866 CODE:
804{ 867{
805 STRLEN textlen; 868 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
807 870
808 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
809} 872}
810 873
874void
875set_shapes (CFPlus::Layout self, ...)
876 CODE:
877{
878 PangoAttrList *attrs = 0;
879 const char *text = pango_layout_get_text (self->pl);
880 const char *pos = text;
881 int arg = 4;
882
883 while (arg < items && (pos = strstr (pos, OBJ_STR)))
884 {
885 PangoRectangle inkrect, rect;
886 PangoAttribute *attr;
887
888 int x = SvIV (ST (arg - 3));
889 int y = SvIV (ST (arg - 2));
890 int w = SvIV (ST (arg - 1));
891 int h = SvIV (ST (arg ));
892
893 inkrect.x = 0;
894 inkrect.y = 0;
895 inkrect.width = 0;
896 inkrect.height = 0;
897
898 rect.x = x * PANGO_SCALE;
899 rect.y = y * PANGO_SCALE;
900 rect.width = w * PANGO_SCALE;
901 rect.height = h * PANGO_SCALE;
902
903 if (!attrs)
904 attrs = pango_layout_get_attributes (self->pl);
905
906 attr = pango_attr_shape_new (&inkrect, &rect);
907 attr->start_index = pos - text;
908 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
909 pango_attr_list_insert (attrs, attr);
910
911 arg += 4;
912 pos += sizeof (OBJ_STR) - 1;
913 }
914
915 if (attrs)
916 pango_layout_set_attributes (self->pl, attrs);
917}
918
919void
920get_shapes (CFPlus::Layout self)
921 PPCODE:
922{
923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
924
925 do
926 {
927 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
928
929 if (run && shape_attr_p (run))
930 {
931 PangoRectangle extents;
932 pango_layout_iter_get_run_extents (iter, 0, &extents);
933
934 EXTEND (SP, 2);
935 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
936 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
937 }
938 }
939 while (pango_layout_iter_next_run (iter));
940
941 pango_layout_iter_free (iter);
942}
943
944int
945has_wrapped (CFPlus::Layout self)
946 CODE:
947{
948 int lines = 1;
949 const char *text = pango_layout_get_text (self->pl);
950
951 while (*text)
952 lines += *text++ == '\n';
953
954 RETVAL = lines < pango_layout_get_line_count (self->pl);
955}
956 OUTPUT:
957 RETVAL
958
811SV * 959SV *
812get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
813 CODE: 961 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 963 sv_utf8_decode (RETVAL);
816 OUTPUT: 964 OUTPUT:
817 RETVAL 965 RETVAL
818 966
819void 967void
820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 968set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821 CODE: 969 CODE:
822 self->r = r; 970 self->r = r;
823 self->g = g; 971 self->g = g;
824 self->b = b; 972 self->b = b;
825 self->a = a; 973 self->a = a;
826 974
827void 975void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 977 CODE:
830 if (self->font != font) 978 if (self->font != font)
831 { 979 {
832 self->font = font; 980 self->font = font;
833 layout_update_font (self); 981 layout_update_font (self);
834 } 982 }
835 983
836void 984void
837set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
838 CODE: 986 CODE:
839 if (self->base_height != base_height) 987 if (self->base_height != base_height)
840 { 988 {
841 self->base_height = base_height; 989 self->base_height = base_height;
842 layout_update_font (self); 990 layout_update_font (self);
843 } 991 }
844 992
845void 993void
846set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 995 CODE:
848 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 996 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849 997
850void 998void
851set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
852 CODE: 1000 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 1002
855void 1003void
856set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 1005 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 1007
860void 1008void
861set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 1010 CODE:
863 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
868 ); 1016 );
869 1017
870void 1018void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 1020 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 1022
875void 1023void
876size (CFClient::Layout self) 1024size (CFPlus::Layout self)
877 PPCODE: 1025 PPCODE:
878{ 1026{
879 int w, h; 1027 int w, h;
880 1028
881 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
886} 1034}
887 1035
888int 1036int
1037descent (CFPlus::Layout self)
1038 CODE:
1039{
1040 PangoRectangle rect;
1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1042 pango_layout_line_get_pixel_extents (line, 0, &rect);
1043 RETVAL = PANGO_DESCENT (rect);
1044}
1045 OUTPUT:
1046 RETVAL
1047
1048int
889xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1050 CODE:
891{ 1051{
892 int index, trailing; 1052 int index, trailing;
893 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894 RETVAL = index; 1054 RETVAL = index;
895} 1055}
896 OUTPUT: 1056 OUTPUT:
897 RETVAL 1057 RETVAL
898 1058
899void 1059void
900cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1061 PPCODE:
902{ 1062{
903 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1065
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1070}
911 1071
912void 1072void
913render (CFClient::Layout self) 1073render (CFPlus::Layout self, float x, float y, int flags = 0)
914 PPCODE: 1074 PPCODE:
915{ 1075 pango_opengl_render_layout_subpixel (
916 SV *retval; 1076 self->pl,
917 int w, h; 1077 x * PANGO_SCALE, y * PANGO_SCALE,
918 1078 self->r, self->g, self->b, self->a,
919 layout_get_pixel_size (self, &w, &h);
920
921 if (self->rgba)
922 { 1079 flags
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925
926 retval = newSV (w * h * 4);
927 SvPOK_only (retval);
928 SvCUR_set (retval, w * h * 4);
929
930 memset (SvPVX (retval), 0, w * h * 4);
931
932 surface = cairo_image_surface_create_for_data (
933 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934 cairo = cairo_create (surface);
935 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937 pango_cairo_show_layout (cairo, self->pl);
938
939 cairo_destroy (cairo);
940 cairo_surface_destroy (surface);
941
942 // what a mess, and its premultiplied, too :(
943 {
944 uint32_t *p = (uint32_t *)SvPVX (retval);
945 uint32_t *e = p + w * h;
946
947 while (p < e)
948 {
949 uint32_t rgba = *p;
950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
963 rgba = SDL_SwapBE32 (rgba);
964 *p++ = rgba;
965 }
966 }
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_RGBA8)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 } 1080 );
975 else
976 {
977 FT_Bitmap bitmap;
978 1081
979 retval = newSV (w * h);
980 SvPOK_only (retval);
981 SvCUR_set (retval, w * h);
982
983 bitmap.rows = h;
984 bitmap.width = w;
985 bitmap.pitch = w;
986 bitmap.buffer = (unsigned char*)SvPVX (retval);
987 bitmap.num_grays = 256;
988 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990 memset (bitmap.buffer, 0, w * h);
991
992 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994 EXTEND (SP, 5);
995 PUSHs (sv_2mortal (newSViv (w)));
996 PUSHs (sv_2mortal (newSViv (h)));
997 PUSHs (sv_2mortal (retval));
998 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000 }
1001}
1002
1003MODULE = CFClient PACKAGE = CFClient::Texture 1082MODULE = CFPlus PACKAGE = CFPlus::Texture
1004 1083
1005void 1084void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1085pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE: 1086 CODE:
1008{ 1087{
1086 glDisable (GL_ALPHA_TEST); 1165 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1166 glDisable (GL_BLEND);
1088 } 1167 }
1089} 1168}
1090 1169
1091MODULE = CFClient PACKAGE = CFClient::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1171
1093CFClient::Map 1172CFPlus::Map
1094new (SV *class, int map_width, int map_height) 1173new (SV *class)
1095 CODE: 1174 CODE:
1096 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1176 RETVAL->x = 0;
1098 RETVAL->y = 0; 1177 RETVAL->y = 0;
1099 RETVAL->w = map_width; 1178 RETVAL->w = 0;
1100 RETVAL->h = map_height; 1179 RETVAL->h = 0;
1101 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
1102 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
1103 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
1104 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1105 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
1108 RETVAL->row = 0; 1187 RETVAL->row = 0;
1109 OUTPUT: 1188 OUTPUT:
1110 RETVAL 1189 RETVAL
1111 1190
1112void 1191void
1113DESTROY (CFClient::Map self) 1192DESTROY (CFPlus::Map self)
1114 CODE: 1193 CODE:
1115{ 1194{
1116 map_clear (self); 1195 map_clear (self);
1117 Safefree (self->face); 1196 Safefree (self->face);
1118 Safefree (self->tex); 1197 Safefree (self->tex);
1119 Safefree (self); 1198 Safefree (self);
1120} 1199}
1121 1200
1122void 1201void
1202resize (CFPlus::Map self, int map_width, int map_height)
1203 CODE:
1204 self->w = map_width;
1205 self->h = map_height;
1206
1207void
1123clear (CFClient::Map self) 1208clear (CFPlus::Map self)
1124 CODE: 1209 CODE:
1125 map_clear (self); 1210 map_clear (self);
1126 1211
1127void 1212void
1128set_face (CFClient::Map self, int face, int texid) 1213set_face (CFPlus::Map self, int face, int texid)
1129 CODE: 1214 CODE:
1130{ 1215{
1131 while (self->faces <= face) 1216 while (self->faces <= face)
1132 { 1217 {
1133 Append (mapface, self->face, self->faces, self->faces); 1218 Append (mapface, self->face, self->faces, self->faces);
1136 1221
1137 self->face [face] = texid; 1222 self->face [face] = texid;
1138} 1223}
1139 1224
1140void 1225void
1141set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1226set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1142 CODE: 1227 CODE:
1143{ 1228{
1144 while (self->texs <= texid) 1229 while (self->texs <= texid)
1145 { 1230 {
1146 Append (maptex, self->tex, self->texs, self->texs); 1231 Append (maptex, self->tex, self->texs, self->texs);
1170 // from transparent color bleeding and ugly wrapping effects. 1255 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1256 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1257}
1173 1258
1174int 1259int
1175ox (CFClient::Map self) 1260ox (CFPlus::Map self)
1176 ALIAS: 1261 ALIAS:
1177 oy = 1 1262 oy = 1
1178 x = 2 1263 x = 2
1179 y = 3 1264 y = 3
1180 w = 4 1265 w = 4
1191 } 1276 }
1192 OUTPUT: 1277 OUTPUT:
1193 RETVAL 1278 RETVAL
1194 1279
1195void 1280void
1196scroll (CFClient::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1282 CODE:
1198{ 1283{
1199 if (dx > 0) 1284 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1201 else if (dx < 0) 1286 else if (dx < 0)
1202 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1287 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1203 1288
1204 if (dy > 0) 1289 if (dy > 0)
1205 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1206 else if (dy < 0) 1291 else if (dy < 0)
1207 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1292 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1208 1293
1209 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1210 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1211 1296
1212 while (self->y < 0) 1297 while (self->y < 0)
1217 self->y += MAP_EXTEND_Y; 1302 self->y += MAP_EXTEND_Y;
1218 } 1303 }
1219} 1304}
1220 1305
1221void 1306void
1222map1a_update (CFClient::Map self, SV *data_) 1307map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223 CODE: 1308 CODE:
1224{ 1309{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1311 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1312 mapcell *cell;
1228 int x, y, flags; 1313 int x, y, flags;
1229 1314
1230 while (data < data_end) 1315 while (data < data_end - 1)
1231 { 1316 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1317 flags = (data [0] << 8) + data [1]; data += 2;
1233 1318
1234 x = ((flags >> 10) & 63) + self->x; 1319 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1320 y = self->y + ((flags >> 4) & 63);
1236 1321
1237 cell = map_get_cell (self, x, y); 1322 cell = map_get_cell (self, x, y);
1238 1323
1239 if (flags & 15) 1324 if (flags & 15)
1240 { 1325 {
1241 if (cell->darkness < 0) 1326 if (!cell->darkness)
1242 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1243 cell->darkness = 0; 1329 cell->darkness = 256;
1244 cell->face [0] = 0;
1245 cell->face [1] = 0;
1246 cell->face [2] = 0;
1247 } 1330 }
1248 1331
1249 cell->darkness = flags & 8 ? *data++ : 255;
1250
1251 //TODO: don't trust server data to be in-range(!) 1332 //TODO: don't trust server data to be in-range(!)
1333
1334 if (flags & 8)
1335 {
1336 if (extmap)
1337 {
1338 uint8_t ext, cmd;
1339
1340 do
1341 {
1342 ext = *data++;
1343 cmd = ext & 0x3f;
1344
1345 if (cmd < 4)
1346 cell->darkness = 255 - ext * 64 + 1;
1347 else if (cmd == 5) // health
1348 {
1349 cell->stat_width = 1;
1350 cell->stat_hp = *data++;
1351 }
1352 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width
1355 {
1356 if (*data == 4)
1357 ; // decode player tag
1358
1359 data += *data + 1;
1360 }
1361 else if (cmd == 8) // cell flags
1362 cell->flags = *data++;
1363 else if (ext & 0x40) // unknown, multibyte => skip
1364 data += *data + 1;
1365 else
1366 data++;
1367 }
1368 while (ext & 0x80);
1369 }
1370 else
1371 cell->darkness = *data++ + 1;
1372 }
1252 1373
1253 if (flags & 4) 1374 if (flags & 4)
1254 { 1375 {
1255 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1376 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1256 } 1377 }
1264 { 1385 {
1265 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1266 } 1387 }
1267 } 1388 }
1268 else 1389 else
1269 cell->darkness = -1; 1390 cell->darkness = 0;
1270 } 1391 }
1271} 1392}
1272 1393
1273SV * 1394SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1396 CODE:
1276{ 1397{
1277 int x1, x; 1398 int x1, x;
1278 int y1, y; 1399 int y1, y;
1279 int z; 1400 int z;
1329} 1450}
1330 OUTPUT: 1451 OUTPUT:
1331 RETVAL 1452 RETVAL
1332 1453
1333void 1454void
1334draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1455draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1335 PPCODE: 1456 CODE:
1336{ 1457{
1337 int vx, vy;
1338 int x, y, z; 1458 int x, y, z;
1339 int last_name; 1459 int last_name;
1340 mapface face; 1460 mapface face;
1341 int sw4 = (sw + 3) & ~3;
1342 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344
1345 memset (darkness, 255, sw4 * sh);
1346 SvPOK_only (darkness_sv);
1347 SvCUR_set (darkness_sv, sw4 * sh);
1348
1349 vx = self->x + (self->w - sw) / 2 - shift_x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y;
1351
1352 /*
1353 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1356
1357 int vy = self->vy = self->h >= sh
1358 ? self->y + (self->h - sh) / 2
1359 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */
1361 1461
1362 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1363 1463
1464 glEnable (GL_BLEND);
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D); 1466 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368 1468
1369 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1370 1470
1371 last_name = 0; 1471 last_name = 0;
1372 1472
1473 mx += self->x;
1474 my += self->y;
1475
1373 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1374 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1375 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1376 { 1479 {
1377 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1378 1481
1379 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1381 { 1484 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1383
1384 darkness[y * sw4 + x] = cell->darkness < 0
1385 ? 255 - FOW_DARKNESS
1386 : 255 - cell->darkness;
1387 1486
1388 face = cell->face [z]; 1487 face = cell->face [z];
1389 1488
1390 if (face) 1489 if (face && face < self->texs)
1391 { 1490 {
1392 maptex tex = self->tex [face]; 1491 maptex tex = self->tex [face];
1393
1394 int px = (x + 1) * 32 - tex.w; 1492 int px = (x + 1) * 32 - tex.w;
1395 int py = (y + 1) * 32 - tex.h; 1493 int py = (y + 1) * 32 - tex.h;
1396 1494
1397 if (last_name != tex.name) 1495 if (last_name != tex.name)
1398 { 1496 {
1399 glEnd (); 1497 glEnd ();
1400 last_name = tex.name;
1401 glBindTexture (GL_TEXTURE_2D, last_name); 1498 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1402 glBegin (GL_QUADS); 1499 glBegin (GL_QUADS);
1403 } 1500 }
1404 1501
1405 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1502 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1503 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1504 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1408 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1505 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409 } 1506 }
1507
1508 if (cell->flags && z == 2)
1509 {
1510 if (cell->flags & 1)
1511 {
1512 maptex tex = self->tex [1];
1513 int px = (x + 1) * 32 - tex.w + 2;
1514 int py = (y + 1) * 32 - tex.h - 6;
1515
1516 glEnd ();
1517 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1518 glBegin (GL_QUADS);
1519
1520 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1521 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1522 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1523 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1524 }
1525 }
1410 } 1526 }
1411 } 1527 }
1412 1528
1413 glEnd (); 1529 glEnd ();
1414 1530
1415 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1532 glDisable (GL_BLEND);
1533
1534 // top layer: overlays such as the health bar
1535 for (y = 0; y < sh; y++)
1536 if (0 <= y + my && y + my < self->rows)
1537 {
1538 maprow *row = self->row + (y + my);
1539
1540 for (x = 0; x < sw; x++)
1541 if (row->c0 <= x + mx && x + mx < row->c1)
1542 {
1543 mapcell *cell = row->col + (x + mx - row->c0);
1544
1545 int px = x * 32;
1546 int py = y * 32;
1547
1548 if (cell->stat_hp)
1549 {
1550 int width = cell->stat_width * 32;
1551 int thick = sh / 28 + 1 + cell->stat_width;
1552
1553 glColor3ub (0, 0, 0);
1554 glRectf (px + 1, py - thick - 2,
1555 px + width - 1, py);
1556
1557 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1558 glRectf (px + 2,
1559 py - thick - 1,
1560 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1561 }
1562 }
1563 }
1564}
1565
1566void
1567draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1568 CODE:
1569{
1570 static float color[16][3] = {
1571 { 0.00F, 0.00F, 0.00F },
1572 { 1.00F, 1.00F, 1.00F },
1573 { 0.00F, 0.00F, 0.55F },
1574 { 1.00F, 0.00F, 0.00F },
1575
1576 { 1.00F, 0.54F, 0.00F },
1577 { 0.11F, 0.56F, 1.00F },
1578 { 0.93F, 0.46F, 0.00F },
1579 { 0.18F, 0.54F, 0.34F },
1580
1581 { 0.56F, 0.73F, 0.56F },
1582 { 0.80F, 0.80F, 0.80F },
1583 { 0.55F, 0.41F, 0.13F },
1584 { 0.99F, 0.77F, 0.26F },
1585
1586 { 0.74F, 0.65F, 0.41F },
1587
1588 { 0.00F, 1.00F, 1.00F },
1589 { 1.00F, 0.00F, 1.00F },
1590 { 1.00F, 1.00F, 0.00F },
1591 };
1592
1593 int x, y;
1594
1595 glEnable (GL_TEXTURE_2D);
1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1597 glEnable (GL_BLEND);
1598 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1599 glBegin (GL_QUADS);
1600
1601 for (y = 0; y < h; y++)
1602 for (x = 0; x < w; x++)
1603 {
1604 unsigned char m = data [x + y * w];
1605
1606 if (m)
1607 {
1608 float *c = color [m & 15];
1609
1610 float tx1 = m & 0x40 ? 0.5 : 0.;
1611 float tx2 = tx1 + 0.5;
1612
1613 glColor4f (c[0], c[1], c[2], 0.75);
1614 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1615 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1616 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1617 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1618 }
1619 }
1620
1621 glEnd ();
1622 glDisable (GL_BLEND);
1623 glDisable (GL_TEXTURE_2D);
1624}
1625
1626void
1627fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1628 PPCODE:
1629{
1630 int x, y;
1631 int sw4 = (sw + 3) & ~3;
1632 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1633 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1634
1635 memset (darkness, 255, sw4 * sh);
1636 SvPOK_only (darkness_sv);
1637 SvCUR_set (darkness_sv, sw4 * sh);
1638
1639 mx += self->x;
1640 my += self->y;
1641
1642 for (y = 0; y < sh; y++)
1643 if (0 <= y + my && y + my < self->rows)
1644 {
1645 maprow *row = self->row + (y + my);
1646
1647 for (x = 0; x < sw; x++)
1648 if (row->c0 <= x + mx && x + mx < row->c1)
1649 {
1650 mapcell *cell = row->col + (x + mx - row->c0);
1651
1652 darkness[y * sw4 + x] = cell->darkness
1653 ? 255 - (cell->darkness - 1)
1654 : 255 - FOW_DARKNESS;
1655 }
1656 }
1417 1657
1418 EXTEND (SP, 3); 1658 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1659 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1660 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1661 PUSHs (darkness_sv);
1422} 1662}
1423 1663
1424SV * 1664SV *
1425get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1665get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426 CODE: 1666 CODE:
1427{ 1667{
1428 int x, y, x1, y1; 1668 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 1669 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1670 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1492} 1732}
1493 OUTPUT: 1733 OUTPUT:
1494 RETVAL 1734 RETVAL
1495 1735
1496void 1736void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1737set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 1738 PPCODE:
1499{ 1739{
1500 int x, y, z; 1740 int x, y, z;
1501 int w, h; 1741 int w, h;
1502 int x1, y1; 1742 int x1, y1;
1534 1774
1535 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1775 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1536 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1776 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1537 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1777 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1538 1778
1539 if (cell->darkness <= 0) 1779 if (cell->darkness == 0)
1540 { 1780 {
1541 cell->darkness = -1; 1781 cell->darkness = 0;
1542 1782
1543 for (z = 0; z <= 2; z++) 1783 for (z = 0; z <= 2; z++)
1544 { 1784 {
1545 cell->face[z] = face[z]; 1785 cell->face[z] = face[z];
1546 1786
1551 } 1791 }
1552 } 1792 }
1553 } 1793 }
1554} 1794}
1555 1795
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 1796MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 1797
1558CFClient::MixChunk 1798CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 1799new_from_file (SV *class, char *path)
1560 CODE: 1800 CODE:
1561 RETVAL = Mix_LoadWAV (path); 1801 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 1802 OUTPUT:
1563 RETVAL 1803 RETVAL
1564 1804
1565void 1805void
1566DESTROY (CFClient::MixChunk self) 1806DESTROY (CFPlus::MixChunk self)
1567 CODE: 1807 CODE:
1568 Mix_FreeChunk (self); 1808 Mix_FreeChunk (self);
1569 1809
1570int 1810int
1571volume (CFClient::MixChunk self, int volume = -1) 1811volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 1812 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 1813 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 1814 OUTPUT:
1575 RETVAL 1815 RETVAL
1576 1816
1577int 1817int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1818play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 1819 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1820 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 1821 OUTPUT:
1582 RETVAL 1822 RETVAL
1583 1823
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 1824MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 1825
1586int 1826int
1587volume (int volume = -1) 1827volume (int volume = -1)
1588 CODE: 1828 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 1829 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 1830 OUTPUT:
1591 RETVAL 1831 RETVAL
1592 1832
1593CFClient::MixMusic 1833CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 1834new_from_file (SV *class, char *path)
1595 CODE: 1835 CODE:
1596 RETVAL = Mix_LoadMUS (path); 1836 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 1837 OUTPUT:
1598 RETVAL 1838 RETVAL
1599 1839
1600void 1840void
1601DESTROY (CFClient::MixMusic self) 1841DESTROY (CFPlus::MixMusic self)
1602 CODE: 1842 CODE:
1603 Mix_FreeMusic (self); 1843 Mix_FreeMusic (self);
1604 1844
1605int 1845int
1606play (CFClient::MixMusic self, int loops = -1) 1846play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 1847 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 1848 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 1849 OUTPUT:
1610 RETVAL 1850 RETVAL
1611 1851
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 1852MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613 1853
1614BOOT: 1854BOOT:
1615{ 1855{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1856 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 1857 static const struct {
1618 const char *name; 1858 const char *name;
1619 IV iv; 1859 IV iv;
1620 } *civ, const_iv[] = { 1860 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 1861# define const_iv(name) { # name, (IV)name }
1628 const_iv (GL_SCISSOR_TEST), 1868 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 1869 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 1870 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 1871 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 1872 const_iv (GL_RESCALE_NORMAL),
1873 const_iv (GL_FRONT),
1874 const_iv (GL_BACK),
1633 const_iv (GL_AND), 1875 const_iv (GL_AND),
1634 const_iv (GL_ONE), 1876 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 1877 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 1878 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 1879 const_iv (GL_DST_ALPHA),
1682 const_iv (GL_SEPARABLE_2D), 1924 const_iv (GL_SEPARABLE_2D),
1683 const_iv (GL_CONVOLUTION_2D), 1925 const_iv (GL_CONVOLUTION_2D),
1684 const_iv (GL_CONVOLUTION_BORDER_MODE), 1926 const_iv (GL_CONVOLUTION_BORDER_MODE),
1685 const_iv (GL_CONSTANT_BORDER), 1927 const_iv (GL_CONSTANT_BORDER),
1686 const_iv (GL_LINES), 1928 const_iv (GL_LINES),
1929 const_iv (GL_LINE_STRIP),
1687 const_iv (GL_LINE_LOOP), 1930 const_iv (GL_LINE_LOOP),
1688 const_iv (GL_QUADS), 1931 const_iv (GL_QUADS),
1689 const_iv (GL_QUAD_STRIP), 1932 const_iv (GL_QUAD_STRIP),
1690 const_iv (GL_TRIANGLES), 1933 const_iv (GL_TRIANGLES),
1691 const_iv (GL_TRIANGLE_STRIP), 1934 const_iv (GL_TRIANGLE_STRIP),
1759 2002
1760void glPopMatrix () 2003void glPopMatrix ()
1761 2004
1762void glLoadIdentity () 2005void glLoadIdentity ()
1763 2006
2007void glDrawBuffer (int buffer)
2008
2009void glReadBuffer (int buffer)
2010
1764# near_ and far_ are due to microsofts buggy "c" compiler 2011# near_ and far_ are due to microsofts buggy "c" compiler
1765void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2012void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1766 2013
1767# near_ and far_ are due to microsofts buggy "c" compiler 2014# near_ and far_ are due to microsofts buggy "c" compiler
1768void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2015void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1797 r *= a; 2044 r *= a;
1798 g *= a; 2045 g *= a;
1799 b *= a; 2046 b *= a;
1800 } 2047 }
1801 // microsoft visual "c" rounds instead of truncating... 2048 // microsoft visual "c" rounds instead of truncating...
1802 glColor4ub (MIN ((int)(r * 256.f), 255), 2049 glColor4f (r, g, b, a);
1803 MIN ((int)(g * 256.f), 255),
1804 MIN ((int)(b * 256.f), 255),
1805 MIN ((int)(a * 256.f), 255));
1806 2050
1807void glInterleavedArrays (int format, int stride, char *data) 2051void glInterleavedArrays (int format, int stride, char *data)
1808 2052
1809void glDrawElements (int mode, int count, int type, char *indices) 2053void glDrawElements (int mode, int count, int type, char *indices)
1810 2054
1887 2131
1888void glEndList () 2132void glEndList ()
1889 2133
1890void glCallList (int list) 2134void glCallList (int list)
1891 2135
1892

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines