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.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.184 by root, Fri Apr 20 17:25:41 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // 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"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
15#include <stdlib.h> 23#include <stdlib.h>
16 24
18#include <SDL_endian.h> 26#include <SDL_endian.h>
19#include <SDL_image.h> 27#include <SDL_image.h>
20#include <SDL_mixer.h> 28#include <SDL_mixer.h>
21#include <SDL_opengl.h> 29#include <SDL_opengl.h>
22 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
23#include <glib/gmacros.h> 34#include <glib/gmacros.h>
24 35
25#include <pango/pango.h> 36#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 37
30#ifndef _WIN32 38#ifndef _WIN32
31# include <sys/types.h> 39# include <sys/types.h>
32# include <sys/socket.h> 40# include <sys/socket.h>
33# include <netinet/in.h> 41# include <netinet/in.h>
34# include <netinet/tcp.h> 42# include <netinet/tcp.h>
35# include <inttypes.h> 43# 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 44#endif
44 45
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 47
49#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
50 49
51#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
53 52
54#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
55 60
56static struct 61static struct
57{ 62{
58#define GL_FUNC(ptr,name) ptr name; 63#define GL_FUNC(ptr,name) ptr name;
59#include "glfunc.h" 64#include "glfunc.h"
68 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69 else 74 else
70 glBlendFunc (sa, da); 75 glBlendFunc (sa, da);
71} 76}
72 77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
73typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
74typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
75 86
76typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
77 88
78static int 89static int
79shape_attr_p (PangoLayoutRun *run) 90shape_attr_p (PangoLayoutRun *run)
80{ 91{
81 GSList *attrs = run->item->analysis.extra_attrs; 92 GSList *attrs = run->item->analysis.extra_attrs;
92 103
93 return 0; 104 return 0;
94} 105}
95 106
96typedef struct cf_layout { 107typedef struct cf_layout {
97 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
100 int base_height; 110 int base_height;
101 CFClient__Font font; 111 CFPlus__Font font;
102} *CFClient__Layout; 112} *CFPlus__Layout;
103 113
104static CFClient__Font default_font; 114static CFPlus__Font default_font;
105static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
106static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
107 117
108static void 118static void
109substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
110{ 120{
111 FcPatternAddBool (pattern, FC_HINTING, 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE 122#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif 124#endif
115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
120} 126}
121 127
122static void 128static void
123layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
124{ 130{
125 /* use a random scale factor to account for unknown descenders, 0.8 works 131 /* use a random scale factor to account for unknown descenders, 0.8 works
126 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
127 */ 133 */
128 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
132 138
133 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
134} 140}
135 141
136static void 142static void
137layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
139 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
140 149
141 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143 152
144 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
145} 154 if (!rect.height) rect.height = 1;
146 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
147typedef uint16_t mapface; 161typedef uint16_t faceid;
148 162
149typedef struct { 163typedef struct {
150 GLint name; 164 int name;
151 int w, h; 165 int w, h;
152 float s, t; 166 float s, t;
153 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
168 tileid smoothtile;
169 uint8_t smoothlevel;
154} maptex; 170} maptex;
155 171
156typedef struct { 172typedef struct {
173 uint32_t player;
174 tileid tile[3];
157 int16_t darkness; 175 uint16_t darkness;
158 mapface face[3]; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
159} mapcell; 177} mapcell;
160 178
161typedef struct { 179typedef struct {
162 int32_t c0, c1; 180 int32_t c0, c1;
163 mapcell *col; 181 mapcell *col;
164} maprow; 182} maprow;
165 183
166typedef struct map { 184typedef struct map {
167 int x, y, w, h; 185 int x, y, w, h;
168 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
169 int faces; 187 int faces; tileid *face2tile; // [faceid]
170 mapface *face; 188 int texs; maptex *tex; // [tileid]
171
172 int texs;
173 maptex *tex;
174 189
175 int32_t rows; 190 int32_t rows;
176 maprow *row; 191 maprow *row;
177} *CFClient__Map; 192} *CFPlus__Map;
178 193
179static char * 194static char *
180prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
181{ 196{
182 char *p; 197 char *p;
199} 214}
200 215
201#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203 218
219static void
220need_facenum (struct map *self, faceid face)
221{
222 while (self->faces <= face)
223 {
224 Append (tileid, self->face2tile, self->faces, self->faces);
225 self->faces *= 2;
226 }
227}
228
229static void
230need_texid (struct map *self, int texid)
231{
232 while (self->texs <= texid)
233 {
234 Append (maptex, self->tex, self->texs, self->texs);
235 self->texs *= 2;
236 }
237}
238
204static maprow * 239static maprow *
205map_get_row (CFClient__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
206{ 241{
207 if (0 > y) 242 if (0 > y)
208 { 243 {
209 int extend = - y + MAP_EXTEND_Y; 244 int extend = - y + MAP_EXTEND_Y;
210 Prepend (maprow, self->row, self->rows, extend); 245 Prepend (maprow, self->row, self->rows, extend);
248 283
249 return row->col + (x - row->c0); 284 return row->col + (x - row->c0);
250} 285}
251 286
252static mapcell * 287static mapcell *
253map_get_cell (CFClient__Map self, int x, int y) 288map_get_cell (CFPlus__Map self, int x, int y)
254{ 289{
255 return row_get_cell (map_get_row (self, y), x); 290 return row_get_cell (map_get_row (self, y), x);
256} 291}
257 292
258static void 293static void
259map_clear (CFClient__Map self) 294map_clear (CFPlus__Map self)
260{ 295{
261 int r; 296 int r;
262 297
263 for (r = 0; r < self->rows; r++) 298 for (r = 0; r < self->rows; r++)
264 Safefree (self->row[r].col); 299 Safefree (self->row[r].col);
272 self->row = 0; 307 self->row = 0;
273 self->rows = 0; 308 self->rows = 0;
274} 309}
275 310
276static void 311static void
277map_blank (CFClient__Map self, int x0, int y0, int w, int h) 312map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278{ 313{
279 int x, y; 314 int x, y;
280 maprow *row; 315 maprow *row;
316 mapcell *cell;
281 317
282 for (y = y0; y < y0 + h; y++) 318 for (y = y0; y < y0 + h; y++)
283 if (y >= 0) 319 if (y >= 0)
284 { 320 {
285 if (y >= self->rows) 321 if (y >= self->rows)
291 if (x >= row->c0) 327 if (x >= row->c0)
292 { 328 {
293 if (x >= row->c1) 329 if (x >= row->c1)
294 break; 330 break;
295 331
296 row->col[x - row->c0].darkness = -1; 332 cell = row->col + x - row->c0;
333
334 cell->darkness = 0;
335 cell->stat_hp = 0;
336 cell->flags = 0;
337 cell->player = 0;
297 } 338 }
298 } 339 }
340}
341
342typedef struct {
343 tileid tile;
344 uint8_t x, y, level;
345} smooth_key;
346
347static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351
352 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else
355 sv_setiv (*sv, bits);
299} 356}
300 357
301static void 358static void
302music_finished (void) 359music_finished (void)
303{ 360{
339 n |= n >> 16; 396 n |= n >> 16;
340 397
341 return n + 1; 398 return n + 1;
342} 399}
343 400
401/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314
404
405static AV *texture_av;
406
344MODULE = CFClient PACKAGE = CFClient 407MODULE = CFPlus PACKAGE = CFPlus
345 408
346PROTOTYPES: ENABLE 409PROTOTYPES: ENABLE
347 410
348BOOT: 411BOOT:
349{ 412{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
350 HV *stash = gv_stashpv ("CFClient", 1); 416 HV *stash = gv_stashpv ("CFPlus", 1);
351 static const struct { 417 static const struct {
352 const char *name; 418 const char *name;
353 IV iv; 419 IV iv;
354 } *civ, const_iv[] = { 420 } *civ, const_iv[] = {
355# define const_iv(name) { # name, (IV)name } 421# define const_iv(name) { # name, (IV)name }
422 const_iv (SDLK_MODIFIER_MIN),
423 const_iv (SDLK_MODIFIER_MAX),
424
356 const_iv (SDL_ACTIVEEVENT), 425 const_iv (SDL_ACTIVEEVENT),
357 const_iv (SDL_KEYDOWN), 426 const_iv (SDL_KEYDOWN),
358 const_iv (SDL_KEYUP), 427 const_iv (SDL_KEYUP),
359 const_iv (SDL_MOUSEMOTION), 428 const_iv (SDL_MOUSEMOTION),
360 const_iv (SDL_MOUSEBUTTONDOWN), 429 const_iv (SDL_MOUSEBUTTONDOWN),
369 const_iv (SDL_EVENT_RESERVEDA), 438 const_iv (SDL_EVENT_RESERVEDA),
370 const_iv (SDL_EVENT_RESERVEDB), 439 const_iv (SDL_EVENT_RESERVEDB),
371 const_iv (SDL_VIDEORESIZE), 440 const_iv (SDL_VIDEORESIZE),
372 const_iv (SDL_VIDEOEXPOSE), 441 const_iv (SDL_VIDEOEXPOSE),
373 const_iv (SDL_USEREVENT), 442 const_iv (SDL_USEREVENT),
443
444 const_iv (SDL_APPINPUTFOCUS),
445 const_iv (SDL_APPMOUSEFOCUS),
446 const_iv (SDL_APPACTIVE),
447
374 const_iv (SDLK_KP0), 448 const_iv (SDLK_KP0),
375 const_iv (SDLK_KP1), 449 const_iv (SDLK_KP1),
376 const_iv (SDLK_KP2), 450 const_iv (SDLK_KP2),
377 const_iv (SDLK_KP3), 451 const_iv (SDLK_KP3),
378 const_iv (SDLK_KP4), 452 const_iv (SDLK_KP4),
433 const_iv (SDLK_BREAK), 507 const_iv (SDLK_BREAK),
434 const_iv (SDLK_MENU), 508 const_iv (SDLK_MENU),
435 const_iv (SDLK_POWER), 509 const_iv (SDLK_POWER),
436 const_iv (SDLK_EURO), 510 const_iv (SDLK_EURO),
437 const_iv (SDLK_UNDO), 511 const_iv (SDLK_UNDO),
512
438 const_iv (KMOD_NONE), 513 const_iv (KMOD_NONE),
514 const_iv (KMOD_SHIFT),
439 const_iv (KMOD_LSHIFT), 515 const_iv (KMOD_LSHIFT),
440 const_iv (KMOD_RSHIFT), 516 const_iv (KMOD_RSHIFT),
517 const_iv (KMOD_CTRL),
441 const_iv (KMOD_LCTRL), 518 const_iv (KMOD_LCTRL),
442 const_iv (KMOD_RCTRL), 519 const_iv (KMOD_RCTRL),
520 const_iv (KMOD_ALT),
443 const_iv (KMOD_LALT), 521 const_iv (KMOD_LALT),
444 const_iv (KMOD_RALT), 522 const_iv (KMOD_RALT),
523 const_iv (KMOD_META),
445 const_iv (KMOD_LMETA), 524 const_iv (KMOD_LMETA),
446 const_iv (KMOD_RMETA), 525 const_iv (KMOD_RMETA),
447 const_iv (KMOD_NUM), 526 const_iv (KMOD_NUM),
448 const_iv (KMOD_CAPS), 527 const_iv (KMOD_CAPS),
449 const_iv (KMOD_MODE), 528 const_iv (KMOD_MODE),
450 const_iv (KMOD_CTRL),
451 const_iv (KMOD_SHIFT),
452 const_iv (KMOD_ALT),
453 const_iv (KMOD_META)
454# undef const_iv 529# undef const_iv
455 }; 530 };
456 531
457 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 532 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 533 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
534
535 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
536 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
459} 537}
538
539void
540weaken (SV *rv)
541 PROTOTYPE: $
542 CODE:
543 sv_rvweaken (rv);
544
545int
546in_destruct ()
547 CODE:
548 RETVAL = PL_main_cv == Nullcv;
549 OUTPUT:
550 RETVAL
460 551
461NV floor (NV x) 552NV floor (NV x)
462 553
463NV ceil (NV x) 554NV ceil (NV x)
464 555
465void 556void
466pango_init () 557pango_init ()
467 CODE: 558 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{ 559{
470 {
471 ft2_fontmap = pango_ft2_font_map_new (); 560 opengl_fontmap = pango_opengl_font_map_new ();
472 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 561 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 562 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
477 cairo_fontmap = pango_cairo_font_map_get_default ();
478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
490} 563}
491 564
492int 565int
493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 566SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494 567
495void 568void
496SDL_Quit () 569SDL_Quit ()
497 570
498void 571void
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 586 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 587 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 588 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516 589
517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 590 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
591#if SDL_VERSION_ATLEAST(1,2,10)
592 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
593 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
594#endif
518 595
519 SDL_EnableUNICODE (1); 596 SDL_EnableUNICODE (1);
520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 597 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521 598
522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 599 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
574 case SDL_KEYDOWN: 651 case SDL_KEYDOWN:
575 case SDL_KEYUP: 652 case SDL_KEYUP:
576 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 655 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
656 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580 break; 658 break;
581 659
582 case SDL_ACTIVEEVENT: 660 case SDL_ACTIVEEVENT:
583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
609 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 687 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 688 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611 break; 689 break;
612 } 690 }
613 691
614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 692 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615 } 693 }
616} 694}
617 695
618int 696int
619Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 697Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
628Mix_AllocateChannels (int numchans = -1) 706Mix_AllocateChannels (int numchans = -1)
629 707
630void 708void
631lowdelay (int fd, int val = 1) 709lowdelay (int fd, int val = 1)
632 CODE: 710 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
712
713void
714win32_proxy_info ()
715 PPCODE:
716{
633#ifndef _WIN32 717#ifdef _WIN32
634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 718 char buffer[2048];
719 DWORD buflen;
720
721 EXTEND (SP, 3);
722
723 buflen = sizeof (buffer);
724 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
725 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
726 {
727 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
728
729 buflen = sizeof (buffer);
730 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
731 {
732 PUSHs (newSVpv (buffer, 0));
733
734 buflen = sizeof (buffer);
735 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
736 PUSHs (newSVpv (buffer, 0));
737 }
738 }
635#endif 739#endif
740}
636 741
637void 742void
638add_font (char *file) 743add_font (char *file)
639 CODE: 744 CODE:
640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 745 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
645 746
646void 747void
647load_image_inline (SV *image_) 748load_image_inline (SV *image_)
648 ALIAS: 749 ALIAS:
649 load_image_file = 1 750 load_image_file = 1
691 792
692 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 793 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693 794
694 assert (surface2->pitch == surface2->w * 4); 795 assert (surface2->pitch == surface2->w * 4);
695 796
797 SDL_LockSurface (surface2);
696 EXTEND (SP, 5); 798 EXTEND (SP, 6);
697 PUSHs (sv_2mortal (newSViv (surface2->w))); 799 PUSHs (sv_2mortal (newSViv (surface2->w)));
698 PUSHs (sv_2mortal (newSViv (surface2->h))); 800 PUSHs (sv_2mortal (newSViv (surface2->h)));
699 SDL_LockSurface (surface2);
700 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 801 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701 SDL_UnlockSurface (surface2);
702 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 802 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 803 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 804 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
805 SDL_UnlockSurface (surface2);
705 806
706 SDL_FreeSurface (surface); 807 SDL_FreeSurface (surface);
707 SDL_FreeSurface (surface2); 808 SDL_FreeSurface (surface2);
708} 809}
709 810
748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749#endif 850#endif
750 _exit (1); 851 _exit (1);
751 852
752void 853void
753_exit (int retval) 854_exit (int retval = 0)
754 CODE: 855 CODE:
856#ifdef WIN32
857 ExitThread (retval); // unclean, please beam me up
858#else
755 _exit (retval); 859 _exit (retval);
860#endif
756 861
757MODULE = CFClient PACKAGE = CFClient::Font 862MODULE = CFPlus PACKAGE = CFPlus::Font
758 863
759CFClient::Font 864CFPlus::Font
760new_from_file (SV *class, char *path, int id = 0) 865new_from_file (SV *class, char *path, int id = 0)
761 CODE: 866 CODE:
762{ 867{
763 int count; 868 int count;
764 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 869 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
767} 872}
768 OUTPUT: 873 OUTPUT:
769 RETVAL 874 RETVAL
770 875
771void 876void
772DESTROY (CFClient::Font self) 877DESTROY (CFPlus::Font self)
773 CODE: 878 CODE:
774 pango_font_description_free (self); 879 pango_font_description_free (self);
775 880
776void 881void
777make_default (CFClient::Font self) 882make_default (CFPlus::Font self)
778 CODE: 883 CODE:
779 default_font = self; 884 default_font = self;
780 885
781MODULE = CFClient PACKAGE = CFClient::Layout 886MODULE = CFPlus PACKAGE = CFPlus::Layout
782 887
783CFClient::Layout 888void
784new (SV *class, int rgba = 0) 889reset_glyph_cache ()
890 CODE:
891 tc_clear ();
892
893CFPlus::Layout
894new (SV *class)
785 CODE: 895 CODE:
786 New (0, RETVAL, 1, struct cf_layout); 896 New (0, RETVAL, 1, struct cf_layout);
787 897
788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 898 RETVAL->pl = pango_layout_new (opengl_context);
789 RETVAL->rgba = rgba;
790 RETVAL->r = 1.; 899 RETVAL->r = 1.;
791 RETVAL->g = 1.; 900 RETVAL->g = 1.;
792 RETVAL->b = 1.; 901 RETVAL->b = 1.;
793 RETVAL->a = 1.; 902 RETVAL->a = 1.;
794 RETVAL->base_height = MIN_FONT_HEIGHT; 903 RETVAL->base_height = MIN_FONT_HEIGHT;
798 layout_update_font (RETVAL); 907 layout_update_font (RETVAL);
799 OUTPUT: 908 OUTPUT:
800 RETVAL 909 RETVAL
801 910
802void 911void
803DESTROY (CFClient::Layout self) 912DESTROY (CFPlus::Layout self)
804 CODE: 913 CODE:
805 g_object_unref (self->pl); 914 g_object_unref (self->pl);
806 Safefree (self); 915 Safefree (self);
807 916
808int
809is_rgba (CFClient::Layout self)
810 CODE:
811 RETVAL = self->rgba;
812 OUTPUT:
813 RETVAL
814
815void 917void
816set_text (CFClient::Layout self, SV *text_) 918set_text (CFPlus::Layout self, SV *text_)
817 CODE: 919 CODE:
818{ 920{
819 STRLEN textlen; 921 STRLEN textlen;
820 char *text = SvPVutf8 (text_, textlen); 922 char *text = SvPVutf8 (text_, textlen);
821 923
822 pango_layout_set_text (self->pl, text, textlen); 924 pango_layout_set_text (self->pl, text, textlen);
823} 925}
824 926
825void 927void
826set_markup (CFClient::Layout self, SV *text_) 928set_markup (CFPlus::Layout self, SV *text_)
827 CODE: 929 CODE:
828{ 930{
829 STRLEN textlen; 931 STRLEN textlen;
830 char *text = SvPVutf8 (text_, textlen); 932 char *text = SvPVutf8 (text_, textlen);
831 933
832 pango_layout_set_markup (self->pl, text, textlen); 934 pango_layout_set_markup (self->pl, text, textlen);
833} 935}
834 936
835void 937void
836set_shapes (CFClient::Layout self, ...) 938set_shapes (CFPlus::Layout self, ...)
837 CODE: 939 CODE:
838{ 940{
839 PangoAttrList *attrs = 0; 941 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl); 942 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text; 943 const char *pos = text;
842 int arg = 2; 944 int arg = 4;
843 945
844 while (arg < items && (pos = strstr (pos, OBJ_STR))) 946 while (arg < items && (pos = strstr (pos, OBJ_STR)))
845 { 947 {
846 PangoRectangle rect; 948 PangoRectangle inkrect, rect;
847 PangoAttribute *attr; 949 PangoAttribute *attr;
848 950
951 int x = SvIV (ST (arg - 3));
952 int y = SvIV (ST (arg - 2));
849 int w = SvIV (ST (arg - 1)); 953 int w = SvIV (ST (arg - 1));
850 int h = SvIV (ST (arg)); 954 int h = SvIV (ST (arg ));
851 955
852 arg += 2;
853
854 rect.x = 0; 956 inkrect.x = 0;
957 inkrect.y = 0;
958 inkrect.width = 0;
959 inkrect.height = 0;
960
961 rect.x = x * PANGO_SCALE;
855 rect.y = -h * PANGO_SCALE; 962 rect.y = y * PANGO_SCALE;
856 rect.width = w * PANGO_SCALE; 963 rect.width = w * PANGO_SCALE;
857 rect.height = h * PANGO_SCALE; 964 rect.height = h * PANGO_SCALE;
858 965
859 if (!attrs) 966 if (!attrs)
860 attrs = pango_layout_get_attributes (self->pl); 967 attrs = pango_layout_get_attributes (self->pl);
861 968
862 attr = pango_attr_shape_new (&rect, &rect); 969 attr = pango_attr_shape_new (&inkrect, &rect);
863 attr->start_index = pos - text; 970 attr->start_index = pos - text;
864 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1; 971 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865 pango_attr_list_insert (attrs, attr); 972 pango_attr_list_insert (attrs, attr);
866 973
974 arg += 4;
867 pos += sizeof (OBJ_STR) - 1; 975 pos += sizeof (OBJ_STR) - 1;
868 } 976 }
869 977
870 if (attrs) 978 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 979 pango_layout_set_attributes (self->pl, attrs);
872} 980}
873 981
874void 982void
875get_shapes (CFClient::Layout self) 983get_shapes (CFPlus::Layout self)
876 PPCODE: 984 PPCODE:
877{ 985{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 986 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 987
880 do 988 do
884 if (run && shape_attr_p (run)) 992 if (run && shape_attr_p (run))
885 { 993 {
886 PangoRectangle extents; 994 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents); 995 pango_layout_iter_get_run_extents (iter, 0, &extents);
888 996
997 EXTEND (SP, 2);
889 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 998 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 999 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891 } 1000 }
892 } 1001 }
893 while (pango_layout_iter_next_run (iter)); 1002 while (pango_layout_iter_next_run (iter));
894 1003
895 pango_layout_iter_free (iter); 1004 pango_layout_iter_free (iter);
896} 1005}
897 1006
898int 1007int
899has_wrapped (CFClient::Layout self) 1008has_wrapped (CFPlus::Layout self)
900 CODE: 1009 CODE:
901{ 1010{
902 int lines = 1; 1011 int lines = 1;
903 const char *text = pango_layout_get_text (self->pl); 1012 const char *text = pango_layout_get_text (self->pl);
904 1013
909} 1018}
910 OUTPUT: 1019 OUTPUT:
911 RETVAL 1020 RETVAL
912 1021
913SV * 1022SV *
914get_text (CFClient::Layout self) 1023get_text (CFPlus::Layout self)
915 CODE: 1024 CODE:
916 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1025 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917 sv_utf8_decode (RETVAL); 1026 sv_utf8_decode (RETVAL);
918 OUTPUT: 1027 OUTPUT:
919 RETVAL 1028 RETVAL
920 1029
921void 1030void
922set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1031set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923 CODE: 1032 CODE:
924 self->r = r; 1033 self->r = r;
925 self->g = g; 1034 self->g = g;
926 self->b = b; 1035 self->b = b;
927 self->a = a; 1036 self->a = a;
928 1037
929void 1038void
930set_font (CFClient::Layout self, CFClient::Font font = 0) 1039set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931 CODE: 1040 CODE:
932 if (self->font != font) 1041 if (self->font != font)
933 { 1042 {
934 self->font = font; 1043 self->font = font;
935 layout_update_font (self); 1044 layout_update_font (self);
936 } 1045 }
937 1046
938void 1047void
939set_height (CFClient::Layout self, int base_height) 1048set_height (CFPlus::Layout self, int base_height)
940 CODE: 1049 CODE:
941 if (self->base_height != base_height) 1050 if (self->base_height != base_height)
942 { 1051 {
943 self->base_height = base_height; 1052 self->base_height = base_height;
944 layout_update_font (self); 1053 layout_update_font (self);
945 } 1054 }
946 1055
947void 1056void
948set_width (CFClient::Layout self, int max_width = -1) 1057set_width (CFPlus::Layout self, int max_width = -1)
949 CODE: 1058 CODE:
950 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1059 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951 1060
952void 1061void
953set_indent (CFClient::Layout self, int indent) 1062set_indent (CFPlus::Layout self, int indent)
954 CODE: 1063 CODE:
955 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1064 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956 1065
957void 1066void
958set_spacing (CFClient::Layout self, int spacing) 1067set_spacing (CFPlus::Layout self, int spacing)
959 CODE: 1068 CODE:
960 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1069 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961 1070
962void 1071void
963set_ellipsise (CFClient::Layout self, int ellipsise) 1072set_ellipsise (CFPlus::Layout self, int ellipsise)
964 CODE: 1073 CODE:
965 pango_layout_set_ellipsize (self->pl, 1074 pango_layout_set_ellipsize (self->pl,
966 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1075 ellipsise == 1 ? PANGO_ELLIPSIZE_START
967 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1076 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1077 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
969 : PANGO_ELLIPSIZE_NONE 1078 : PANGO_ELLIPSIZE_NONE
970 ); 1079 );
971 1080
972void 1081void
973set_single_paragraph_mode (CFClient::Layout self, int spm) 1082set_single_paragraph_mode (CFPlus::Layout self, int spm)
974 CODE: 1083 CODE:
975 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1084 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976 1085
977void 1086void
978size (CFClient::Layout self) 1087size (CFPlus::Layout self)
979 PPCODE: 1088 PPCODE:
980{ 1089{
981 int w, h; 1090 int w, h;
982 1091
983 layout_get_pixel_size (self, &w, &h); 1092 layout_get_pixel_size (self, &w, &h);
986 PUSHs (sv_2mortal (newSViv (w))); 1095 PUSHs (sv_2mortal (newSViv (w)));
987 PUSHs (sv_2mortal (newSViv (h))); 1096 PUSHs (sv_2mortal (newSViv (h)));
988} 1097}
989 1098
990int 1099int
1100descent (CFPlus::Layout self)
1101 CODE:
1102{
1103 PangoRectangle rect;
1104 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1105 pango_layout_line_get_pixel_extents (line, 0, &rect);
1106 RETVAL = PANGO_DESCENT (rect);
1107}
1108 OUTPUT:
1109 RETVAL
1110
1111int
991xy_to_index (CFClient::Layout self, int x, int y) 1112xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1113 CODE:
993{ 1114{
994 int index, trailing; 1115 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1116 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1117 RETVAL = index + trailing;
997} 1118}
998 OUTPUT: 1119 OUTPUT:
999 RETVAL 1120 RETVAL
1000 1121
1001void 1122void
1002cursor_pos (CFClient::Layout self, int index) 1123cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1124 PPCODE:
1004{ 1125{
1005 PangoRectangle strong_pos; 1126 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1127 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1128
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1133}
1013 1134
1014void 1135void
1015render (CFClient::Layout self) 1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1016 PPCODE: 1137 PPCODE:
1017{ 1138{
1018 SV *retval; 1139 int line, x;
1019 int w, h;
1020 1140
1021 layout_get_pixel_size (self, &w, &h); 1141 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1142 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1022 1143
1023 if (self->rgba)
1024 {
1025 cairo_surface_t *surface;
1026 cairo_t *cairo;
1027
1028 retval = newSV (w * h * 4);
1029 SvPOK_only (retval);
1030 SvCUR_set (retval, w * h * 4);
1031
1032 memset (SvPVX (retval), 0, w * h * 4);
1033
1034 surface = cairo_image_surface_create_for_data (
1035 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1036 cairo = cairo_create (surface);
1037 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039 pango_cairo_show_layout (cairo, self->pl);
1040
1041 cairo_destroy (cairo);
1042 cairo_surface_destroy (surface);
1043
1044 // what a mess, and its premultiplied, too :(
1045 {
1046 uint32_t *p = (uint32_t *)SvPVX (retval);
1047 uint32_t *e = p + w * h;
1048
1049 while (p < e)
1050 {
1051 uint32_t rgba = *p;
1052 rgba = (rgba >> 24) | (rgba << 8);
1053#if 0
1054#ifdef _WIN32
1055 {//D
1056 uint8_t r = rgba >> 24;
1057 uint8_t g = rgba >> 16;
1058 uint8_t b = rgba >> 8;
1059 uint8_t a = rgba >> 0;
1060
1061 rgba = (rgba & 0xffffff00) | a;
1062 }
1063#endif
1064#endif
1065 rgba = SDL_SwapBE32 (rgba);
1066 *p++ = rgba;
1067 }
1068 }
1069
1070 EXTEND (SP, 5); 1144 EXTEND (SP, 2);
1071 PUSHs (sv_2mortal (newSViv (w))); 1145 PUSHs (sv_2mortal (newSViv (line - 1)));
1146 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1147}
1148
1149void
1150line_x_to_index (CFPlus::Layout self, int line, int x)
1151 PPCODE:
1152{
1153 PangoLayoutLine *lp;
1154 int index, trailing;
1155
1156 if (line < 0)
1157 XSRETURN_EMPTY;
1158
1159 if (!(lp = pango_layout_get_line (self->pl, line)))
1160 XSRETURN_EMPTY; /* do better */
1161
1162 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1163
1164 EXTEND (SP, 2);
1165 if (GIMME_V == G_SCALAR)
1072 PUSHs (sv_2mortal (newSViv (h))); 1166 PUSHs (sv_2mortal (newSViv (index + trailing)));
1073 PUSHs (sv_2mortal (retval));
1074 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 }
1077 else 1167 else
1078 { 1168 {
1079 FT_Bitmap bitmap;
1080
1081 retval = newSV (w * h);
1082 SvPOK_only (retval);
1083 SvCUR_set (retval, w * h);
1084
1085 bitmap.rows = h;
1086 bitmap.width = w;
1087 bitmap.pitch = w;
1088 bitmap.buffer = (unsigned char*)SvPVX (retval);
1089 bitmap.num_grays = 256;
1090 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092 memset (bitmap.buffer, 0, w * h);
1093
1094 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096 EXTEND (SP, 5);
1097 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (index)));
1098 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (trailing)));
1099 PUSHs (sv_2mortal (retval));
1100 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102 } 1171 }
1103} 1172}
1104 1173
1174void
1175render (CFPlus::Layout self, float x, float y, int flags = 0)
1176 PPCODE:
1177 pango_opengl_render_layout_subpixel (
1178 self->pl,
1179 x * PANGO_SCALE, y * PANGO_SCALE,
1180 self->r, self->g, self->b, self->a,
1181 flags
1182 );
1183
1105MODULE = CFClient PACKAGE = CFClient::Texture 1184MODULE = CFPlus PACKAGE = CFPlus::Texture
1106 1185
1107void 1186void
1108pad2pot (SV *data_, SV *w_, SV *h_) 1187pad2pot (SV *data_, SV *w_, SV *h_)
1109 CODE: 1188 CODE:
1110{ 1189{
1188 glDisable (GL_ALPHA_TEST); 1267 glDisable (GL_ALPHA_TEST);
1189 glDisable (GL_BLEND); 1268 glDisable (GL_BLEND);
1190 } 1269 }
1191} 1270}
1192 1271
1193MODULE = CFClient PACKAGE = CFClient::Map 1272MODULE = CFPlus PACKAGE = CFPlus::Map
1194 1273
1195CFClient::Map 1274CFPlus::Map
1196new (SV *class, int map_width, int map_height) 1275new (SV *class)
1197 CODE: 1276 CODE:
1198 New (0, RETVAL, 1, struct map); 1277 New (0, RETVAL, 1, struct map);
1199 RETVAL->x = 0; 1278 RETVAL->x = 0;
1200 RETVAL->y = 0; 1279 RETVAL->y = 0;
1201 RETVAL->w = map_width; 1280 RETVAL->w = 0;
1202 RETVAL->h = map_height; 1281 RETVAL->h = 0;
1203 RETVAL->ox = 0; 1282 RETVAL->ox = 0;
1204 RETVAL->oy = 0; 1283 RETVAL->oy = 0;
1205 RETVAL->faces = 8192; 1284 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1206 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1285 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1207 RETVAL->texs = 8192;
1208 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1209 RETVAL->rows = 0; 1286 RETVAL->rows = 0;
1210 RETVAL->row = 0; 1287 RETVAL->row = 0;
1211 OUTPUT: 1288 OUTPUT:
1212 RETVAL 1289 RETVAL
1213 1290
1214void 1291void
1215DESTROY (CFClient::Map self) 1292DESTROY (CFPlus::Map self)
1216 CODE: 1293 CODE:
1217{ 1294{
1218 map_clear (self); 1295 map_clear (self);
1219 Safefree (self->face); 1296 Safefree (self->face2tile);
1220 Safefree (self->tex); 1297 Safefree (self->tex);
1221 Safefree (self); 1298 Safefree (self);
1222} 1299}
1223 1300
1224void 1301void
1302resize (CFPlus::Map self, int map_width, int map_height)
1303 CODE:
1304 self->w = map_width;
1305 self->h = map_height;
1306
1307void
1225clear (CFClient::Map self) 1308clear (CFPlus::Map self)
1226 CODE: 1309 CODE:
1227 map_clear (self); 1310 map_clear (self);
1228 1311
1229void 1312void
1230set_face (CFClient::Map self, int face, int texid) 1313set_tileid (CFPlus::Map self, int face, int tile)
1231 CODE: 1314 CODE:
1232{ 1315{
1233 while (self->faces <= face) 1316 need_facenum (self, face); self->face2tile [face] = tile;
1234 { 1317 need_texid (self, tile);
1235 Append (mapface, self->face, self->faces, self->faces);
1236 self->faces *= 2;
1237 }
1238
1239 self->face [face] = texid;
1240} 1318}
1241 1319
1242void 1320void
1321set_smooth (CFPlus::Map self, int face, int smooth, int level)
1322 CODE:
1323{
1324 tileid texid;
1325 maptex *tex;
1326
1327 if (face < 0 || face >= self->faces)
1328 return;
1329
1330 if (smooth < 0 || smooth >= self->faces)
1331 return;
1332
1333 texid = self->face2tile [face];
1334
1335 if (!texid)
1336 return;
1337
1338 tex = self->tex + texid;
1339 tex->smoothtile = self->face2tile [smooth];
1340 tex->smoothlevel = level;
1341}
1342
1343void
1243set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1344set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1244 CODE: 1345 CODE:
1245{ 1346{
1246 while (self->texs <= texid) 1347 need_texid (self, texid);
1247 {
1248 Append (maptex, self->tex, self->texs, self->texs);
1249 self->texs *= 2;
1250 }
1251 1348
1252 { 1349 {
1253 maptex *tex = self->tex + texid; 1350 maptex *tex = self->tex + texid;
1254 1351
1255 tex->name = name; 1352 tex->name = name;
1272 // from transparent color bleeding and ugly wrapping effects. 1369 // from transparent color bleeding and ugly wrapping effects.
1273 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1370 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274} 1371}
1275 1372
1276int 1373int
1277ox (CFClient::Map self) 1374ox (CFPlus::Map self)
1278 ALIAS: 1375 ALIAS:
1279 oy = 1 1376 oy = 1
1280 x = 2 1377 x = 2
1281 y = 3 1378 y = 3
1282 w = 4 1379 w = 4
1293 } 1390 }
1294 OUTPUT: 1391 OUTPUT:
1295 RETVAL 1392 RETVAL
1296 1393
1297void 1394void
1298scroll (CFClient::Map self, int dx, int dy) 1395scroll (CFPlus::Map self, int dx, int dy)
1299 CODE: 1396 CODE:
1300{ 1397{
1301 if (dx > 0) 1398 if (dx > 0)
1302 map_blank (self, self->x, self->y, dx - 1, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1303 else if (dx < 0) 1400 else if (dx < 0)
1304 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1401 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1305 1402
1306 if (dy > 0) 1403 if (dy > 0)
1307 map_blank (self, self->x, self->y, self->w, dy - 1); 1404 map_blank (self, self->x, self->y, self->w, dy);
1308 else if (dy < 0) 1405 else if (dy < 0)
1309 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1406 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1310 1407
1311 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1312 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1313 1410
1314 while (self->y < 0) 1411 while (self->y < 0)
1319 self->y += MAP_EXTEND_Y; 1416 self->y += MAP_EXTEND_Y;
1320 } 1417 }
1321} 1418}
1322 1419
1323void 1420void
1324map1a_update (CFClient::Map self, SV *data_) 1421map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325 CODE: 1422 CODE:
1326{ 1423{
1327 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1424 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1328 uint8_t *data_end = (uint8_t *)SvEND (data_); 1425 uint8_t *data_end = (uint8_t *)SvEND (data_);
1329 mapcell *cell; 1426 mapcell *cell;
1330 int x, y, flags; 1427 int x, y, flags;
1331 1428
1332 while (data < data_end) 1429 while (data < data_end - 1)
1333 { 1430 {
1334 flags = (data [0] << 8) + data [1]; data += 2; 1431 flags = (data [0] << 8) + data [1]; data += 2;
1335 1432
1336 x = self->x + ((flags >> 10) & 63); 1433 x = self->x + ((flags >> 10) & 63);
1337 y = self->y + ((flags >> 4) & 63); 1434 y = self->y + ((flags >> 4) & 63);
1338 1435
1339 cell = map_get_cell (self, x, y); 1436 cell = map_get_cell (self, x, y);
1340 1437
1341 if (flags & 15) 1438 if (flags & 15)
1342 { 1439 {
1343 if (cell->darkness < 0) 1440 if (!cell->darkness)
1344 { 1441 {
1442 memset (cell, 0, sizeof (*cell));
1345 cell->darkness = 0; 1443 cell->darkness = 256;
1346 cell->face [0] = 0;
1347 cell->face [1] = 0;
1348 cell->face [2] = 0;
1349 } 1444 }
1350 1445
1351 cell->darkness = flags & 8 ? *data++ : 255;
1352
1353 //TODO: don't trust server data to be in-range(!) 1446 //TODO: don't trust server data to be in-range(!)
1447
1448 if (flags & 8)
1449 {
1450 if (extmap)
1451 {
1452 uint8_t ext, cmd;
1453
1454 do
1455 {
1456 ext = *data++;
1457 cmd = ext & 0x3f;
1458
1459 if (cmd < 4)
1460 cell->darkness = 255 - ext * 64 + 1;
1461 else if (cmd == 5) // health
1462 {
1463 cell->stat_width = 1;
1464 cell->stat_hp = *data++;
1465 }
1466 else if (cmd == 6) // monster width
1467 cell->stat_width = *data++ + 1;
1468 else if (cmd == 0x47)
1469 {
1470 if (*data == 4)
1471 ; // decode player count
1472
1473 data += *data + 1;
1474 }
1475 else if (cmd == 8) // cell flags
1476 cell->flags = *data++;
1477 else if (ext & 0x40) // unknown, multibyte => skip
1478 data += *data + 1;
1479 else
1480 data++;
1481 }
1482 while (ext & 0x80);
1483 }
1484 else
1485 cell->darkness = *data++ + 1;
1486 }
1354 1487
1355 if (flags & 4) 1488 if (flags & 4)
1356 { 1489 {
1357 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1490 faceid face = (data [0] << 8) + data [1]; data += 2;
1491 need_facenum (self, face);
1492 cell->tile [0] = self->face2tile [face];
1358 } 1493 }
1359 1494
1360 if (flags & 2) 1495 if (flags & 2)
1361 { 1496 {
1362 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1497 faceid face = (data [0] << 8) + data [1]; data += 2;
1498 need_facenum (self, face);
1499 cell->tile [1] = self->face2tile [face];
1363 } 1500 }
1364 1501
1365 if (flags & 1) 1502 if (flags & 1)
1366 { 1503 {
1367 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1504 faceid face = (data [0] << 8) + data [1]; data += 2;
1505 need_facenum (self, face);
1506 cell->tile [2] = self->face2tile [face];
1368 } 1507 }
1369 } 1508 }
1370 else 1509 else
1371 cell->darkness = -1; 1510 cell->darkness = 0;
1372 } 1511 }
1373} 1512}
1374 1513
1375SV * 1514SV *
1376mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1515mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377 CODE: 1516 CODE:
1378{ 1517{
1379 int x1, x; 1518 int x1, x;
1380 int y1, y; 1519 int y1, y;
1381 int z; 1520 int z;
1402 { 1541 {
1403 mapcell *cell = row->col + (x - row->c0); 1542 mapcell *cell = row->col + (x - row->c0);
1404 1543
1405 for (z = 0; z <= 0; z++) 1544 for (z = 0; z <= 0; z++)
1406 { 1545 {
1407 mapface face = cell->face [z];
1408
1409 if (face)
1410 {
1411 maptex tex = self->tex [face]; 1546 maptex tex = self->tex [cell->tile [z]];
1412 int a0 = 255 - tex.a; 1547 int a0 = 255 - tex.a;
1413 int a1 = tex.a; 1548 int a1 = tex.a;
1414 1549
1415 r = (r * a0 + tex.r * a1) / 255; 1550 r = (r * a0 + tex.r * a1) / 255;
1416 g = (g * a0 + tex.g * a1) / 255; 1551 g = (g * a0 + tex.g * a1) / 255;
1417 b = (b * a0 + tex.b * a1) / 255; 1552 b = (b * a0 + tex.b * a1) / 255;
1418 a = (a * a0 + tex.a * a1) / 255; 1553 a = (a * a0 + tex.a * a1) / 255;
1419 }
1420 } 1554 }
1421 } 1555 }
1422 1556
1423 *map++ = (r ) 1557 *map++ = (r )
1424 | (g << 8) 1558 | (g << 8)
1431} 1565}
1432 OUTPUT: 1566 OUTPUT:
1433 RETVAL 1567 RETVAL
1434 1568
1435void 1569void
1436draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1570draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1437 CODE: 1571 CODE:
1438{ 1572{
1439 int vx, vy; 1573 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1574 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1575 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1576 smooth_key skey;
1440 int x, y, z; 1577 int x, y, z;
1441 int last_name; 1578 int last_name;
1442 mapface face;
1443 1579
1444 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1580 // thats current max. sorry.
1445 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1581 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255;
1446 1583
1447 /* 1584 // clear key, in case of extra padding
1448 int vx = self->vx = self->w >= sw 1585 memset (&skey, 0, sizeof (skey));
1449 ? self->x + (self->w - sw) / 2
1450 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1451
1452 int vy = self->vy = self->h >= sh
1453 ? self->y + (self->h - sh) / 2
1454 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1455 */
1456 1586
1457 glColor4ub (255, 255, 255, 255); 1587 glColor4ub (255, 255, 255, 255);
1458 1588
1459 glEnable (GL_BLEND); 1589 glEnable (GL_BLEND);
1460 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1463 1593
1464 glBegin (GL_QUADS); 1594 glBegin (GL_QUADS);
1465 1595
1466 last_name = 0; 1596 last_name = 0;
1467 1597
1598 mx += self->x;
1599 my += self->y;
1600
1601 // first pass: determine smooth_max
1602 // rather ugly, if you ask me
1603 // could also be stored inside mapcell and updated on change
1604 memset (smooth_max, 0, sizeof (smooth_max));
1605
1606 for (y = 0; y < sh; y++)
1607 if (0 <= y + my && y + my < self->rows)
1608 {
1609 maprow *row = self->row + (y + my);
1610
1611 for (x = 0; x < sw; x++)
1612 if (row->c0 <= x + mx && x + mx < row->c1)
1613 {
1614 mapcell *cell = row->col + (x + mx - row->c0);
1615
1616 smooth_max[x + 1][y + 1] =
1617 MAX (self->tex [cell->tile [0]].smoothlevel,
1618 MAX (self->tex [cell->tile [1]].smoothlevel,
1619 self->tex [cell->tile [2]].smoothlevel));
1620 }
1621 }
1622
1468 for (z = 0; z < 3; z++) 1623 for (z = 0; z <= 2; z++)
1624 {
1625 memset (smooth_level, 0, sizeof (smooth_level));
1626
1469 for (y = 0; y < sh; y++) 1627 for (y = 0; y < sh; y++)
1470 if (0 <= y + vy && y + vy < self->rows) 1628 if (0 <= y + my && y + my < self->rows)
1471 { 1629 {
1472 maprow *row = self->row + (y + vy); 1630 maprow *row = self->row + (y + my);
1473 1631
1474 for (x = 0; x < sw; x++) 1632 for (x = 0; x < sw; x++)
1475 if (row->c0 <= x + vx && x + vx < row->c1) 1633 if (row->c0 <= x + mx && x + mx < row->c1)
1476 { 1634 {
1477 mapcell *cell = row->col + (x + vx - row->c0); 1635 mapcell *cell = row->col + (x + mx - row->c0);
1478
1479 face = cell->face [z]; 1636 tileid tile = cell->tile [z];
1480 1637
1481 if (face) 1638 if (tile)
1639 {
1640 maptex tex = self->tex [tile];
1641 int px = (x + 1) * T - tex.w;
1642 int py = (y + 1) * T - tex.h;
1643
1644 // suppressing texture state switches here
1645 // is only moderately effective, but worth the extra effort
1646 if (last_name != tex.name)
1647 {
1648 if (!tex.name)
1649 tex = self->tex [2]; /* missing, replace by noface */
1650
1651 glEnd ();
1652 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1653 glBegin (GL_QUADS);
1654 }
1655
1656 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1657 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1658 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1659 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1660
1661 if (cell->flags && z == 2)
1662 {
1663 if (cell->flags & 1)
1664 {
1665 maptex tex = self->tex [1];
1666 int px = x * T + T * 2 / 32;
1667 int py = y * T - T * 6 / 32;
1668
1669 glEnd ();
1670 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1671 glBegin (GL_QUADS);
1672
1673 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1674 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1675 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1676 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1677 }
1678 }
1679
1680 // update smooth hash
1681 if (tex.smoothtile)
1682 {
1683 skey.tile = tex.smoothtile;
1684 skey.level = tex.smoothlevel;
1685
1686 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1687
1688 // add bits to current tile and all neighbours. skey.x|y is
1689 // shifted +1|+1 so we always stay positive.
1690
1691 // bits is ___n cccc CCCC bbbb
1692 // n do not draw borders&corners
1693 // c draw these corners, but...
1694 // C ... not these
1695 // b draw these borders
1696
1697 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1698 // ┃· ·· ·┃ ━━
1699
1700 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1701 // ·· ·· ·┏ ┓·
1702
1703 // full tile
1704 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1705
1706 // borders
1707 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1708 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1709 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1710 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1711
1712 // corners
1713 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1714 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1715 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1716 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1717 }
1718 }
1719 }
1720 }
1721
1722 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort
1724 {
1725 int w, b;
1726
1727 for (w = 0; w < 256 / 32; ++w)
1728 {
1729 uint32_t smask = smooth_level [w];
1730 if (smask)
1731 for (b = 0; b < 32; ++b)
1732 if (smask & (((uint32_t)1) << b))
1482 { 1733 {
1483 maptex tex = self->tex [face]; 1734 int level = (w << 5) | b;
1735 HE *he;
1484 1736
1485 int px = (x + 1) * 32 - tex.w; 1737 hv_iterinit (smooth);
1486 int py = (y + 1) * 32 - tex.h; 1738 while ((he = hv_iternext (smooth)))
1487
1488 if (last_name != tex.name)
1489 { 1739 {
1740 smooth_key *skey = (smooth_key *)HeKEY (he);
1741 IV bits = SvIVX (HeVAL (he));
1742
1743 if (!(bits & 0x1000)
1744 && skey->level == level
1745 && level >= smooth_max [skey->x][skey->y])
1746 {
1747 maptex tex = self->tex [skey->tile];
1748 int px = (((int)skey->x) - 1) * T;
1749 int py = (((int)skey->y) - 1) * T;
1750 int border = bits & 15;
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1752 float dx = tex.s * .0625f; // 16 images/row
1753 float dy = tex.t * .5f ; // 2 images/column
1754
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name)
1758 {
1759 if (!tex.name)
1760 continue; // smoothing not yet available
1761
1490 glEnd (); 1762 glEnd ();
1491 last_name = tex.name;
1492 glBindTexture (GL_TEXTURE_2D, last_name); 1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493 glBegin (GL_QUADS); 1764 glBegin (GL_QUADS);
1765 }
1766
1767 if (border)
1768 {
1769 float ox = border * dx;
1770
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1775 }
1776
1777 if (corner)
1778 {
1779 float ox = corner * dx;
1780
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1785 }
1786 }
1494 } 1787 }
1495
1496 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500 } 1788 }
1501 }
1502 } 1789 }
1790 }
1791
1792 hv_clear (smooth);
1793 }
1503 1794
1504 glEnd (); 1795 glEnd ();
1505 1796
1506 glDisable (GL_TEXTURE_2D); 1797 glDisable (GL_TEXTURE_2D);
1507 glDisable (GL_BLEND); 1798 glDisable (GL_BLEND);
1508}
1509 1799
1800 // top layer: overlays such as the health bar
1801 for (y = 0; y < sh; y++)
1802 if (0 <= y + my && y + my < self->rows)
1803 {
1804 maprow *row = self->row + (y + my);
1805
1806 for (x = 0; x < sw; x++)
1807 if (row->c0 <= x + mx && x + mx < row->c1)
1808 {
1809 mapcell *cell = row->col + (x + mx - row->c0);
1810
1811 int px = x * T;
1812 int py = y * T;
1813
1814 if (cell->stat_hp)
1815 {
1816 int width = cell->stat_width * T;
1817 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1818
1819 glColor3ub (0, 0, 0);
1820 glRectf (px + 1, py - thick - 2,
1821 px + width - 1, py);
1822
1823 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1824 glRectf (px + 2,
1825 py - thick - 1,
1826 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1827 }
1828 }
1829 }
1830}
1831
1510void 1832void
1511draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1833draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512 CODE: 1834 CODE:
1513{ 1835{
1514 static float color[16][3] = { 1836 static float color[16][3] = {
1515 { 0.00, 0.00, 0.00 }, 1837 { 0.00F, 0.00F, 0.00F },
1516 { 1.00, 1.00, 1.00 }, 1838 { 1.00F, 1.00F, 1.00F },
1517 { 0.00, 0.00, 0.55 }, 1839 { 0.00F, 0.00F, 0.55F },
1518 { 1.00, 0.00, 0.00 }, 1840 { 1.00F, 0.00F, 0.00F },
1519 1841
1520 { 1.00, 0.54, 0.00 }, 1842 { 1.00F, 0.54F, 0.00F },
1521 { 0.11, 0.56, 1.00 }, 1843 { 0.11F, 0.56F, 1.00F },
1522 { 0.93, 0.46, 0.00 }, 1844 { 0.93F, 0.46F, 0.00F },
1523 { 0.18, 0.54, 0.34 }, 1845 { 0.18F, 0.54F, 0.34F },
1524 1846
1525 { 0.56, 0.73, 0.56 }, 1847 { 0.56F, 0.73F, 0.56F },
1526 { 0.80, 0.80, 0.80 }, 1848 { 0.80F, 0.80F, 0.80F },
1527 { 0.55, 0.41, 0.13 }, 1849 { 0.55F, 0.41F, 0.13F },
1528 { 0.99, 0.77, 0.26 }, 1850 { 0.99F, 0.77F, 0.26F },
1529 1851
1530 { 0.74, 0.65, 0.41 }, 1852 { 0.74F, 0.65F, 0.41F },
1531 1853
1532 { 0.00, 1.00, 1.00 }, 1854 { 0.00F, 1.00F, 1.00F },
1533 { 1.00, 0.00, 1.00 }, 1855 { 1.00F, 0.00F, 1.00F },
1534 { 1.00, 1.00, 0.00 }, 1856 { 1.00F, 1.00F, 0.00F },
1535 }; 1857 };
1536 1858
1537 int x, y; 1859 int x, y;
1538 1860
1539 glEnable (GL_TEXTURE_2D); 1861 glEnable (GL_TEXTURE_2D);
1566 glDisable (GL_BLEND); 1888 glDisable (GL_BLEND);
1567 glDisable (GL_TEXTURE_2D); 1889 glDisable (GL_TEXTURE_2D);
1568} 1890}
1569 1891
1570void 1892void
1571fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1893fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1572 PPCODE: 1894 PPCODE:
1573{ 1895{
1574 int vx, vy;
1575 int x, y; 1896 int x, y;
1576 int sw4 = (sw + 3) & ~3; 1897 int sw4 = (sw + 3) & ~3;
1577 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1578 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1579 1900
1580 memset (darkness, 255, sw4 * sh); 1901 memset (darkness, 255, sw4 * sh);
1581 SvPOK_only (darkness_sv); 1902 SvPOK_only (darkness_sv);
1582 SvCUR_set (darkness_sv, sw4 * sh); 1903 SvCUR_set (darkness_sv, sw4 * sh);
1583 1904
1584 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1905 mx += self->x;
1585 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1906 my += self->y;
1586 1907
1587 for (y = 0; y < sh; y++) 1908 for (y = 0; y < sh; y++)
1588 if (0 <= y + vy && y + vy < self->rows) 1909 if (0 <= y + my && y + my < self->rows)
1589 { 1910 {
1590 maprow *row = self->row + (y + vy); 1911 maprow *row = self->row + (y + my);
1591 1912
1592 for (x = 0; x < sw; x++) 1913 for (x = 0; x < sw; x++)
1593 if (row->c0 <= x + vx && x + vx < row->c1) 1914 if (row->c0 <= x + mx && x + mx < row->c1)
1594 { 1915 {
1595 mapcell *cell = row->col + (x + vx - row->c0); 1916 mapcell *cell = row->col + (x + mx - row->c0);
1596 1917
1597 darkness[y * sw4 + x] = cell->darkness < 0 1918 darkness[y * sw4 + x] = cell->darkness
1919 ? 255 - (cell->darkness - 1)
1598 ? 255 - FOW_DARKNESS 1920 : 255 - FOW_DARKNESS;
1599 : 255 - cell->darkness;
1600 } 1921 }
1601 } 1922 }
1602 1923
1603 EXTEND (SP, 3); 1924 EXTEND (SP, 3);
1604 PUSHs (sv_2mortal (newSViv (sw4))); 1925 PUSHs (sv_2mortal (newSViv (sw4)));
1605 PUSHs (sv_2mortal (newSViv (sh))); 1926 PUSHs (sv_2mortal (newSViv (sh)));
1606 PUSHs (darkness_sv); 1927 PUSHs (darkness_sv);
1607} 1928}
1608 1929
1609SV * 1930SV *
1610get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1931get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611 CODE: 1932 CODE:
1612{ 1933{
1613 int x, y, x1, y1; 1934 int x, y, x1, y1;
1614 SV *data_sv = newSV (w * h * 7 + 5); 1935 SV *data_sv = newSV (w * h * 7 + 5);
1615 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1936 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1640 if (row && row->c0 <= x && x < row->c1) 1961 if (row && row->c0 <= x && x < row->c1)
1641 { 1962 {
1642 mapcell *cell = row->col + (x - row->c0); 1963 mapcell *cell = row->col + (x - row->c0);
1643 uint8_t flags = 0; 1964 uint8_t flags = 0;
1644 1965
1645 if (cell->face [0]) flags |= 1; 1966 if (cell->tile [0]) flags |= 1;
1646 if (cell->face [1]) flags |= 2; 1967 if (cell->tile [1]) flags |= 2;
1647 if (cell->face [2]) flags |= 4; 1968 if (cell->tile [2]) flags |= 4;
1648 1969
1649 *data++ = flags; 1970 *data++ = flags;
1650 1971
1651 if (flags & 1) 1972 if (flags & 1)
1652 { 1973 {
1974 tileid tile = cell->tile [0];
1653 *data++ = cell->face [0] >> 8; 1975 *data++ = tile >> 8;
1654 *data++ = cell->face [0]; 1976 *data++ = tile;
1655 } 1977 }
1656 1978
1657 if (flags & 2) 1979 if (flags & 2)
1658 { 1980 {
1981 tileid tile = cell->tile [1];
1659 *data++ = cell->face [1] >> 8; 1982 *data++ = tile >> 8;
1660 *data++ = cell->face [1]; 1983 *data++ = tile;
1661 } 1984 }
1662 1985
1663 if (flags & 4) 1986 if (flags & 4)
1664 { 1987 {
1988 tileid tile = cell->tile [2];
1665 *data++ = cell->face [2] >> 8; 1989 *data++ = tile >> 8;
1666 *data++ = cell->face [2]; 1990 *data++ = tile;
1667 } 1991 }
1668 } 1992 }
1669 else 1993 else
1670 *data++ = 0; 1994 *data++ = 0;
1671 } 1995 }
1677} 2001}
1678 OUTPUT: 2002 OUTPUT:
1679 RETVAL 2003 RETVAL
1680 2004
1681void 2005void
1682set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2006set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683 PPCODE: 2007 PPCODE:
1684{ 2008{
1685 int x, y, z; 2009 int x, y, z;
1686 int w, h; 2010 int w, h;
1687 int x1, y1; 2011 int x1, y1;
1711 { 2035 {
1712 uint8_t flags = *data++; 2036 uint8_t flags = *data++;
1713 2037
1714 if (flags) 2038 if (flags)
1715 { 2039 {
1716 mapface face[3] = { 0, 0, 0 };
1717
1718 mapcell *cell = row_get_cell (row, x); 2040 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 };
1719 2042
1720 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2043 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1721 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1722 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1723 2046
1724 if (cell->darkness <= 0) 2047 if (cell->darkness == 0)
1725 { 2048 {
1726 cell->darkness = -1; 2049 cell->darkness = 0;
1727 2050
1728 for (z = 0; z <= 2; z++) 2051 for (z = 0; z <= 2; z++)
1729 { 2052 {
1730 cell->face[z] = face[z]; 2053 tileid t = tile [z];
1731 2054
1732 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2055 if (t >= self->texs || (t && !self->tex [t].name))
2056 {
1733 XPUSHs (sv_2mortal (newSViv (face[z]))); 2057 XPUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t);
2059 }
2060
2061 cell->tile [z] = t;
1734 } 2062 }
1735 } 2063 }
1736 } 2064 }
1737 } 2065 }
1738 } 2066 }
1739} 2067}
1740 2068
1741MODULE = CFClient PACKAGE = CFClient::MixChunk 2069MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742 2070
1743CFClient::MixChunk 2071CFPlus::MixChunk
1744new_from_file (SV *class, char *path) 2072new_from_file (SV *class, char *path)
1745 CODE: 2073 CODE:
1746 RETVAL = Mix_LoadWAV (path); 2074 RETVAL = Mix_LoadWAV (path);
1747 OUTPUT: 2075 OUTPUT:
1748 RETVAL 2076 RETVAL
1749 2077
1750void 2078void
1751DESTROY (CFClient::MixChunk self) 2079DESTROY (CFPlus::MixChunk self)
1752 CODE: 2080 CODE:
1753 Mix_FreeChunk (self); 2081 Mix_FreeChunk (self);
1754 2082
1755int 2083int
1756volume (CFClient::MixChunk self, int volume = -1) 2084volume (CFPlus::MixChunk self, int volume = -1)
1757 CODE: 2085 CODE:
1758 RETVAL = Mix_VolumeChunk (self, volume); 2086 RETVAL = Mix_VolumeChunk (self, volume);
1759 OUTPUT: 2087 OUTPUT:
1760 RETVAL 2088 RETVAL
1761 2089
1762int 2090int
1763play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2091play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764 CODE: 2092 CODE:
1765 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2093 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766 OUTPUT: 2094 OUTPUT:
1767 RETVAL 2095 RETVAL
1768 2096
1769MODULE = CFClient PACKAGE = CFClient::MixMusic 2097MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770 2098
1771int 2099int
1772volume (int volume = -1) 2100volume (int volume = -1)
1773 CODE: 2101 CODE:
1774 RETVAL = Mix_VolumeMusic (volume); 2102 RETVAL = Mix_VolumeMusic (volume);
1775 OUTPUT: 2103 OUTPUT:
1776 RETVAL 2104 RETVAL
1777 2105
1778CFClient::MixMusic 2106CFPlus::MixMusic
1779new_from_file (SV *class, char *path) 2107new_from_file (SV *class, char *path)
1780 CODE: 2108 CODE:
1781 RETVAL = Mix_LoadMUS (path); 2109 RETVAL = Mix_LoadMUS (path);
1782 OUTPUT: 2110 OUTPUT:
1783 RETVAL 2111 RETVAL
1784 2112
1785void 2113void
1786DESTROY (CFClient::MixMusic self) 2114DESTROY (CFPlus::MixMusic self)
1787 CODE: 2115 CODE:
1788 Mix_FreeMusic (self); 2116 Mix_FreeMusic (self);
1789 2117
1790int 2118int
1791play (CFClient::MixMusic self, int loops = -1) 2119play (CFPlus::MixMusic self, int loops = -1)
1792 CODE: 2120 CODE:
1793 RETVAL = Mix_PlayMusic (self, loops); 2121 RETVAL = Mix_PlayMusic (self, loops);
1794 OUTPUT: 2122 OUTPUT:
1795 RETVAL 2123 RETVAL
1796 2124
1797MODULE = CFClient PACKAGE = CFClient::OpenGL 2125MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798 2126
1799BOOT: 2127BOOT:
1800{ 2128{
1801 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2129 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802 static const struct { 2130 static const struct {
1803 const char *name; 2131 const char *name;
1804 IV iv; 2132 IV iv;
1805 } *civ, const_iv[] = { 2133 } *civ, const_iv[] = {
1806# define const_iv(name) { # name, (IV)name } 2134# define const_iv(name) { # name, (IV)name }
1869 const_iv (GL_SEPARABLE_2D), 2197 const_iv (GL_SEPARABLE_2D),
1870 const_iv (GL_CONVOLUTION_2D), 2198 const_iv (GL_CONVOLUTION_2D),
1871 const_iv (GL_CONVOLUTION_BORDER_MODE), 2199 const_iv (GL_CONVOLUTION_BORDER_MODE),
1872 const_iv (GL_CONSTANT_BORDER), 2200 const_iv (GL_CONSTANT_BORDER),
1873 const_iv (GL_LINES), 2201 const_iv (GL_LINES),
2202 const_iv (GL_LINE_STRIP),
1874 const_iv (GL_LINE_LOOP), 2203 const_iv (GL_LINE_LOOP),
1875 const_iv (GL_QUADS), 2204 const_iv (GL_QUADS),
1876 const_iv (GL_QUAD_STRIP), 2205 const_iv (GL_QUAD_STRIP),
1877 const_iv (GL_TRIANGLES), 2206 const_iv (GL_TRIANGLES),
1878 const_iv (GL_TRIANGLE_STRIP), 2207 const_iv (GL_TRIANGLE_STRIP),
1988 r *= a; 2317 r *= a;
1989 g *= a; 2318 g *= a;
1990 b *= a; 2319 b *= a;
1991 } 2320 }
1992 // microsoft visual "c" rounds instead of truncating... 2321 // microsoft visual "c" rounds instead of truncating...
1993 glColor4ub (MIN ((int)(r * 256.f), 255), 2322 glColor4f (r, g, b, a);
1994 MIN ((int)(g * 256.f), 255),
1995 MIN ((int)(b * 256.f), 255),
1996 MIN ((int)(a * 256.f), 255));
1997 2323
1998void glInterleavedArrays (int format, int stride, char *data) 2324void glInterleavedArrays (int format, int stride, char *data)
1999 2325
2000void glDrawElements (int mode, int count, int type, char *indices) 2326void glDrawElements (int mode, int count, int type, char *indices)
2001 2327
2049 2375
2050int glGenTexture () 2376int glGenTexture ()
2051 CODE: 2377 CODE:
2052{ 2378{
2053 GLuint name; 2379 GLuint name;
2380 if (AvFILL (texture_av) >= 0)
2381 name = (GLuint)av_pop (texture_av);
2382 else
2054 glGenTextures (1, &name); 2383 glGenTextures (1, &name);
2055 RETVAL = name; 2384 RETVAL = name;
2056} 2385}
2057 OUTPUT: 2386 OUTPUT:
2058 RETVAL 2387 RETVAL
2059 2388
2060void glDeleteTexture (int name) 2389void glDeleteTexture (int name)
2061 CODE: 2390 CODE:
2062{ 2391{
2063 GLuint name_ = name; 2392 /* make a half-assed attempt at returning the memory used by the texture */
2393 /* textures are frequently being reused by cfplus anyway */
2394 glBindTexture (GL_TEXTURE_2D, name);
2395 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2396 av_push (texture_av, (SV *)name);
2064 glDeleteTextures (1, &name_); 2397 /*glDeleteTextures (1, &name_);*/
2065} 2398}
2066 2399
2067int glGenList () 2400int glGenList ()
2068 CODE: 2401 CODE:
2069 RETVAL = glGenLists (1); 2402 RETVAL = glGenLists (1);
2078 2411
2079void glEndList () 2412void glEndList ()
2080 2413
2081void glCallList (int list) 2414void glCallList (int list)
2082 2415
2083

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines