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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.185 by root, Sat Apr 21 09:21:03 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>
23#include <stdlib.h>
15 24
16#include <SDL.h> 25#include <SDL.h>
17#include <SDL_endian.h> 26#include <SDL_endian.h>
18#include <SDL_image.h> 27#include <SDL_image.h>
19#include <SDL_mixer.h> 28#include <SDL_mixer.h>
20#include <SDL_opengl.h> 29#include <SDL_opengl.h>
21 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
22#include <glib/gmacros.h> 34#include <glib/gmacros.h>
23 35
24#include <pango/pango.h> 36#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 37
29#ifndef _WIN32 38#ifndef _WIN32
30# include <sys/types.h> 39# include <sys/types.h>
31# include <sys/socket.h> 40# include <sys/socket.h>
32# include <netinet/in.h> 41# include <netinet/in.h>
33# include <netinet/tcp.h> 42# include <netinet/tcp.h>
34# include <inttypes.h> 43# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 44#endif
43 45
44#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 47
46#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
47 49
48#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
50 52
51#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
52 60
53static struct 61static struct
54{ 62{
55#define GL_FUNC(ptr,name) ptr name; 63#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 64#include "glfunc.h"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 74 else
67 glBlendFunc (sa, da); 75 glBlendFunc (sa, da);
68} 76}
69 77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
70typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
72 86
73typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
88
89static int
90shape_attr_p (PangoLayoutRun *run)
91{
92 GSList *attrs = run->item->analysis.extra_attrs;
93
94 while (attrs)
95 {
96 PangoAttribute *attr = attrs->data;
97
98 if (attr->klass->type == PANGO_ATTR_SHAPE)
99 return 1;
100
101 attrs = attrs->next;
102 }
103
104 return 0;
105}
74 106
75typedef struct cf_layout { 107typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
79 int base_height; 110 int base_height;
80 CFClient__Font font; 111 CFPlus__Font font;
81} *CFClient__Layout; 112} *CFPlus__Layout;
82 113
83static CFClient__Font default_font; 114static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
86 117
87static void 118static void
88substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
89{ 120{
90 FcPatternAddBool (pattern, FC_HINTING, 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef FC_HINT_STYLE 122#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#endif 124#endif
94#ifdef _WIN32
95 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96#else
97 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98#endif
99} 126}
100 127
101static void 128static void
102layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
103{ 130{
104 /* 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
105 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
106 */ 133 */
107 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
111 138
112 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
113} 140}
114 141
115static void 142static void
116layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
118 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
119 149
120 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122 152
123 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
124} 154 if (!rect.height) rect.height = 1;
125 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
126typedef uint16_t mapface; 161typedef uint16_t faceid;
127 162
128typedef struct { 163typedef struct {
129 GLint name; 164 int name;
130 int w, h; 165 int w, h;
131 float s, t; 166 float s, t;
132 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
168 tileid smoothtile;
169 uint8_t smoothlevel;
133} maptex; 170} maptex;
134 171
135typedef struct { 172typedef struct {
173 uint32_t player;
174 tileid tile[3];
136 int16_t darkness; 175 uint16_t darkness;
137 mapface face[3]; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
138} mapcell; 177} mapcell;
139 178
140typedef struct { 179typedef struct {
141 int32_t c0, c1; 180 int32_t c0, c1;
142 mapcell *col; 181 mapcell *col;
143} maprow; 182} maprow;
144 183
145typedef struct map { 184typedef struct map {
146 int x, y, w, h; 185 int x, y, w, h;
147 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
148 int faces; 187 int faces; tileid *face2tile; // [faceid]
149 mapface *face; 188 int texs; maptex *tex; // [tileid]
150
151 int texs;
152 maptex *tex;
153 189
154 int32_t rows; 190 int32_t rows;
155 maprow *row; 191 maprow *row;
156} *CFClient__Map; 192} *CFPlus__Map;
157 193
158static char * 194static char *
159prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
160{ 196{
161 char *p; 197 char *p;
178} 214}
179 215
180#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))
181#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))
182 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
183static maprow * 239static maprow *
184map_get_row (CFClient__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
185{ 241{
186 if (0 > y) 242 if (0 > y)
187 { 243 {
188 int extend = - y + MAP_EXTEND_Y; 244 int extend = - y + MAP_EXTEND_Y;
189 Prepend (maprow, self->row, self->rows, extend); 245 Prepend (maprow, self->row, self->rows, extend);
227 283
228 return row->col + (x - row->c0); 284 return row->col + (x - row->c0);
229} 285}
230 286
231static mapcell * 287static mapcell *
232map_get_cell (CFClient__Map self, int x, int y) 288map_get_cell (CFPlus__Map self, int x, int y)
233{ 289{
234 return row_get_cell (map_get_row (self, y), x); 290 return row_get_cell (map_get_row (self, y), x);
235} 291}
236 292
237static void 293static void
238map_clear (CFClient__Map self) 294map_clear (CFPlus__Map self)
239{ 295{
240 int r; 296 int r;
241 297
242 for (r = 0; r < self->rows; r++) 298 for (r = 0; r < self->rows; r++)
243 Safefree (self->row[r].col); 299 Safefree (self->row[r].col);
251 self->row = 0; 307 self->row = 0;
252 self->rows = 0; 308 self->rows = 0;
253} 309}
254 310
255static void 311static void
256map_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)
257{ 313{
258 int x, y; 314 int x, y;
259 maprow *row; 315 maprow *row;
316 mapcell *cell;
260 317
261 for (y = y0; y < y0 + h; y++) 318 for (y = y0; y < y0 + h; y++)
262 if (y >= 0) 319 if (y >= 0)
263 { 320 {
264 if (y >= self->rows) 321 if (y >= self->rows)
270 if (x >= row->c0) 327 if (x >= row->c0)
271 { 328 {
272 if (x >= row->c1) 329 if (x >= row->c1)
273 break; 330 break;
274 331
275 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;
276 } 338 }
277 } 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);
278} 356}
279 357
280static void 358static void
281music_finished (void) 359music_finished (void)
282{ 360{
301 ev.data2 = 0; 379 ev.data2 = 0;
302 380
303 SDL_PushEvent ((SDL_Event *)&ev); 381 SDL_PushEvent ((SDL_Event *)&ev);
304} 382}
305 383
384static unsigned int
385minpot (unsigned int n)
386{
387 if (!n)
388 return 0;
389
390 --n;
391
392 n |= n >> 1;
393 n |= n >> 2;
394 n |= n >> 4;
395 n |= n >> 8;
396 n |= n >> 16;
397
398 return n + 1;
399}
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
306MODULE = CFClient PACKAGE = CFClient 407MODULE = CFPlus PACKAGE = CFPlus
307 408
308PROTOTYPES: ENABLE 409PROTOTYPES: ENABLE
309 410
310BOOT: 411BOOT:
311{ 412{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
312 HV *stash = gv_stashpv ("CFClient", 1); 416 HV *stash = gv_stashpv ("CFPlus", 1);
313 static const struct { 417 static const struct {
314 const char *name; 418 const char *name;
315 IV iv; 419 IV iv;
316 } *civ, const_iv[] = { 420 } *civ, const_iv[] = {
317# 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
318 const_iv (SDL_ACTIVEEVENT), 425 const_iv (SDL_ACTIVEEVENT),
319 const_iv (SDL_KEYDOWN), 426 const_iv (SDL_KEYDOWN),
320 const_iv (SDL_KEYUP), 427 const_iv (SDL_KEYUP),
321 const_iv (SDL_MOUSEMOTION), 428 const_iv (SDL_MOUSEMOTION),
322 const_iv (SDL_MOUSEBUTTONDOWN), 429 const_iv (SDL_MOUSEBUTTONDOWN),
331 const_iv (SDL_EVENT_RESERVEDA), 438 const_iv (SDL_EVENT_RESERVEDA),
332 const_iv (SDL_EVENT_RESERVEDB), 439 const_iv (SDL_EVENT_RESERVEDB),
333 const_iv (SDL_VIDEORESIZE), 440 const_iv (SDL_VIDEORESIZE),
334 const_iv (SDL_VIDEOEXPOSE), 441 const_iv (SDL_VIDEOEXPOSE),
335 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
336 const_iv (SDLK_KP0), 448 const_iv (SDLK_KP0),
337 const_iv (SDLK_KP1), 449 const_iv (SDLK_KP1),
338 const_iv (SDLK_KP2), 450 const_iv (SDLK_KP2),
339 const_iv (SDLK_KP3), 451 const_iv (SDLK_KP3),
340 const_iv (SDLK_KP4), 452 const_iv (SDLK_KP4),
395 const_iv (SDLK_BREAK), 507 const_iv (SDLK_BREAK),
396 const_iv (SDLK_MENU), 508 const_iv (SDLK_MENU),
397 const_iv (SDLK_POWER), 509 const_iv (SDLK_POWER),
398 const_iv (SDLK_EURO), 510 const_iv (SDLK_EURO),
399 const_iv (SDLK_UNDO), 511 const_iv (SDLK_UNDO),
512
400 const_iv (KMOD_NONE), 513 const_iv (KMOD_NONE),
514 const_iv (KMOD_SHIFT),
401 const_iv (KMOD_LSHIFT), 515 const_iv (KMOD_LSHIFT),
402 const_iv (KMOD_RSHIFT), 516 const_iv (KMOD_RSHIFT),
517 const_iv (KMOD_CTRL),
403 const_iv (KMOD_LCTRL), 518 const_iv (KMOD_LCTRL),
404 const_iv (KMOD_RCTRL), 519 const_iv (KMOD_RCTRL),
520 const_iv (KMOD_ALT),
405 const_iv (KMOD_LALT), 521 const_iv (KMOD_LALT),
406 const_iv (KMOD_RALT), 522 const_iv (KMOD_RALT),
523 const_iv (KMOD_META),
407 const_iv (KMOD_LMETA), 524 const_iv (KMOD_LMETA),
408 const_iv (KMOD_RMETA), 525 const_iv (KMOD_RMETA),
409 const_iv (KMOD_NUM), 526 const_iv (KMOD_NUM),
410 const_iv (KMOD_CAPS), 527 const_iv (KMOD_CAPS),
411 const_iv (KMOD_MODE), 528 const_iv (KMOD_MODE),
412 const_iv (KMOD_CTRL),
413 const_iv (KMOD_SHIFT),
414 const_iv (KMOD_ALT),
415 const_iv (KMOD_META)
416# undef const_iv 529# undef const_iv
417 }; 530 };
418 531
419 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; )
420 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);
421} 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
551
552NV floor (NV x)
553
554NV ceil (NV x)
422 555
423void 556void
424pango_init () 557pango_init ()
425 CODE: 558 CODE:
426 // delayed, so it can pick up new fonts added by AddFontResourceEx
427{ 559{
428 {
429 ft2_fontmap = pango_ft2_font_map_new (); 560 opengl_fontmap = pango_opengl_font_map_new ();
430 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);
431 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 562 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432 }
433 {
434 cairo_font_options_t *fopt = cairo_font_options_create ();
435 cairo_fontmap = pango_cairo_font_map_get_default ();
436 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437#ifdef _WIN32
438 // cairo looks like shit eaten twice on windows
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440#else
441 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442#endif
443 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445 pango_cairo_context_set_font_options (cairo_context, fopt);
446 cairo_font_options_destroy (fopt);
447 }
448} 563}
449 564
450int 565int
451SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 566SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452 567
453void 568void
454SDL_Quit () 569SDL_Quit ()
455 570
456void 571void
463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 578 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 579 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 580 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466 581
467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 582 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 583 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469 584
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 585 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 586 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 587 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 588 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474 589
475 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
476 595
477 SDL_EnableUNICODE (1); 596 SDL_EnableUNICODE (1);
478 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 597 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479 598
480 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 599 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
532 case SDL_KEYDOWN: 651 case SDL_KEYDOWN:
533 case SDL_KEYUP: 652 case SDL_KEYUP:
534 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
535 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
536 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 */
537 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
538 break; 658 break;
539 659
540 case SDL_ACTIVEEVENT: 660 case SDL_ACTIVEEVENT:
541 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
567 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 687 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 688 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569 break; 689 break;
570 } 690 }
571 691
572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 692 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573 } 693 }
574} 694}
575 695
576int 696int
577Mix_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)
586Mix_AllocateChannels (int numchans = -1) 706Mix_AllocateChannels (int numchans = -1)
587 707
588void 708void
589lowdelay (int fd, int val = 1) 709lowdelay (int fd, int val = 1)
590 CODE: 710 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
712
713void
714win32_proxy_info ()
715 PPCODE:
716{
591#ifndef _WIN32 717#ifdef _WIN32
592 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 }
593#endif 739#endif
740}
594 741
595void 742void
596add_font (char *file) 743add_font (char *file)
597 CODE: 744 CODE:
598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 745 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599#ifdef _WIN32
600 // cairo... sigh... requires win2000
601 AddFontResourceEx (file, FR_PRIVATE, 0);
602#endif
603 746
604void 747void
605load_image_inline (SV *image_) 748load_image_inline (SV *image_)
606 ALIAS: 749 ALIAS:
607 load_image_file = 1 750 load_image_file = 1
649 792
650 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 793 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651 794
652 assert (surface2->pitch == surface2->w * 4); 795 assert (surface2->pitch == surface2->w * 4);
653 796
797 SDL_LockSurface (surface2);
654 EXTEND (SP, 5); 798 EXTEND (SP, 6);
655 PUSHs (sv_2mortal (newSViv (surface2->w))); 799 PUSHs (sv_2mortal (newSViv (surface2->w)));
656 PUSHs (sv_2mortal (newSViv (surface2->h))); 800 PUSHs (sv_2mortal (newSViv (surface2->h)));
657 SDL_LockSurface (surface2);
658 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 801 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659 SDL_UnlockSurface (surface2);
660 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 802 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 803 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 804 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
805 SDL_UnlockSurface (surface2);
663 806
664 SDL_FreeSurface (surface); 807 SDL_FreeSurface (surface);
665 SDL_FreeSurface (surface2); 808 SDL_FreeSurface (surface2);
666} 809}
667 810
703 CODE: 846 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 847 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 848#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 850#endif
708 exit (1); 851 _exit (1);
709 852
853void
854_exit (int retval = 0)
855 CODE:
856#ifdef WIN32
857 ExitThread (retval); // unclean, please beam me up
858#else
859 _exit (retval);
860#endif
861
710MODULE = CFClient PACKAGE = CFClient::Font 862MODULE = CFPlus PACKAGE = CFPlus::Font
711 863
712CFClient::Font 864CFPlus::Font
713new_from_file (SV *class, char *path, int id = 0) 865new_from_file (SV *class, char *path, int id = 0)
714 CODE: 866 CODE:
715{ 867{
716 int count; 868 int count;
717 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 869 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
720} 872}
721 OUTPUT: 873 OUTPUT:
722 RETVAL 874 RETVAL
723 875
724void 876void
725DESTROY (CFClient::Font self) 877DESTROY (CFPlus::Font self)
726 CODE: 878 CODE:
727 pango_font_description_free (self); 879 pango_font_description_free (self);
728 880
729void 881void
730make_default (CFClient::Font self) 882make_default (CFPlus::Font self)
731 CODE: 883 CODE:
732 default_font = self; 884 default_font = self;
733 885
734MODULE = CFClient PACKAGE = CFClient::Layout 886MODULE = CFPlus PACKAGE = CFPlus::Layout
735 887
736CFClient::Layout 888void
737new (SV *class, int rgba = 0) 889reset_glyph_cache ()
890 CODE:
891 tc_clear ();
892
893CFPlus::Layout
894new (SV *class)
738 CODE: 895 CODE:
739 New (0, RETVAL, 1, struct cf_layout); 896 New (0, RETVAL, 1, struct cf_layout);
740 897
741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 898 RETVAL->pl = pango_layout_new (opengl_context);
742 RETVAL->rgba = rgba;
743 RETVAL->r = 1.; 899 RETVAL->r = 1.;
744 RETVAL->g = 1.; 900 RETVAL->g = 1.;
745 RETVAL->b = 1.; 901 RETVAL->b = 1.;
746 RETVAL->a = 1.; 902 RETVAL->a = 1.;
747 RETVAL->base_height = MIN_FONT_HEIGHT; 903 RETVAL->base_height = MIN_FONT_HEIGHT;
751 layout_update_font (RETVAL); 907 layout_update_font (RETVAL);
752 OUTPUT: 908 OUTPUT:
753 RETVAL 909 RETVAL
754 910
755void 911void
756DESTROY (CFClient::Layout self) 912DESTROY (CFPlus::Layout self)
757 CODE: 913 CODE:
758 g_object_unref (self->pl); 914 g_object_unref (self->pl);
759 Safefree (self); 915 Safefree (self);
760 916
917void
918set_text (CFPlus::Layout self, SV *text_)
919 CODE:
920{
921 STRLEN textlen;
922 char *text = SvPVutf8 (text_, textlen);
923
924 pango_layout_set_text (self->pl, text, textlen);
925}
926
927void
928set_markup (CFPlus::Layout self, SV *text_)
929 CODE:
930{
931 STRLEN textlen;
932 char *text = SvPVutf8 (text_, textlen);
933
934 pango_layout_set_markup (self->pl, text, textlen);
935}
936
937void
938set_shapes (CFPlus::Layout self, ...)
939 CODE:
940{
941 PangoAttrList *attrs = 0;
942 const char *text = pango_layout_get_text (self->pl);
943 const char *pos = text;
944 int arg = 4;
945
946 while (arg < items && (pos = strstr (pos, OBJ_STR)))
947 {
948 PangoRectangle inkrect, rect;
949 PangoAttribute *attr;
950
951 int x = SvIV (ST (arg - 3));
952 int y = SvIV (ST (arg - 2));
953 int w = SvIV (ST (arg - 1));
954 int h = SvIV (ST (arg ));
955
956 inkrect.x = 0;
957 inkrect.y = 0;
958 inkrect.width = 0;
959 inkrect.height = 0;
960
961 rect.x = x * PANGO_SCALE;
962 rect.y = y * PANGO_SCALE;
963 rect.width = w * PANGO_SCALE;
964 rect.height = h * PANGO_SCALE;
965
966 if (!attrs)
967 attrs = pango_layout_get_attributes (self->pl);
968
969 attr = pango_attr_shape_new (&inkrect, &rect);
970 attr->start_index = pos - text;
971 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
972 pango_attr_list_insert (attrs, attr);
973
974 arg += 4;
975 pos += sizeof (OBJ_STR) - 1;
976 }
977
978 if (attrs)
979 pango_layout_set_attributes (self->pl, attrs);
980}
981
982void
983get_shapes (CFPlus::Layout self)
984 PPCODE:
985{
986 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
987
988 do
989 {
990 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
991
992 if (run && shape_attr_p (run))
993 {
994 PangoRectangle extents;
995 pango_layout_iter_get_run_extents (iter, 0, &extents);
996
997 EXTEND (SP, 2);
998 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
999 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1000 }
1001 }
1002 while (pango_layout_iter_next_run (iter));
1003
1004 pango_layout_iter_free (iter);
1005}
1006
761int 1007int
762is_rgba (CFClient::Layout self) 1008has_wrapped (CFPlus::Layout self)
763 CODE: 1009 CODE:
764 RETVAL = self->rgba; 1010{
1011 int lines = 1;
1012 const char *text = pango_layout_get_text (self->pl);
1013
1014 while (*text)
1015 lines += *text++ == '\n';
1016
1017 RETVAL = lines < pango_layout_get_line_count (self->pl);
1018}
765 OUTPUT: 1019 OUTPUT:
766 RETVAL 1020 RETVAL
767 1021
768void
769set_text (CFClient::Layout self, SV *text_)
770 CODE:
771{
772 STRLEN textlen;
773 char *text = SvPVutf8 (text_, textlen);
774
775 pango_layout_set_text (self->pl, text, textlen);
776}
777
778void
779set_markup (CFClient::Layout self, SV *text_)
780 CODE:
781{
782 STRLEN textlen;
783 char *text = SvPVutf8 (text_, textlen);
784
785 pango_layout_set_markup (self->pl, text, textlen);
786}
787
788SV * 1022SV *
789get_text (CFClient::Layout self) 1023get_text (CFPlus::Layout self)
790 CODE: 1024 CODE:
791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1025 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792 sv_utf8_decode (RETVAL); 1026 sv_utf8_decode (RETVAL);
793 OUTPUT: 1027 OUTPUT:
794 RETVAL 1028 RETVAL
795 1029
796void 1030void
797set_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.)
798 CODE: 1032 CODE:
799 self->r = r; 1033 self->r = r;
800 self->g = g; 1034 self->g = g;
801 self->b = b; 1035 self->b = b;
802 self->a = a; 1036 self->a = a;
803 1037
804void 1038void
805set_font (CFClient::Layout self, CFClient::Font font = 0) 1039set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806 CODE: 1040 CODE:
807 if (self->font != font) 1041 if (self->font != font)
808 { 1042 {
809 self->font = font; 1043 self->font = font;
810 layout_update_font (self); 1044 layout_update_font (self);
811 } 1045 }
812 1046
813void 1047void
814set_height (CFClient::Layout self, int base_height) 1048set_height (CFPlus::Layout self, int base_height)
815 CODE: 1049 CODE:
816 if (self->base_height != base_height) 1050 if (self->base_height != base_height)
817 { 1051 {
818 self->base_height = base_height; 1052 self->base_height = base_height;
819 layout_update_font (self); 1053 layout_update_font (self);
820 } 1054 }
821 1055
822void 1056void
823set_width (CFClient::Layout self, int max_width = -1) 1057set_width (CFPlus::Layout self, int max_width = -1)
824 CODE: 1058 CODE:
825 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);
826 1060
827void 1061void
828set_indent (CFClient::Layout self, int indent) 1062set_indent (CFPlus::Layout self, int indent)
829 CODE: 1063 CODE:
830 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1064 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831 1065
832void 1066void
833set_spacing (CFClient::Layout self, int spacing) 1067set_spacing (CFPlus::Layout self, int spacing)
834 CODE: 1068 CODE:
835 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1069 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836 1070
837void 1071void
838set_ellipsise (CFClient::Layout self, int ellipsise) 1072set_ellipsise (CFPlus::Layout self, int ellipsise)
839 CODE: 1073 CODE:
840 pango_layout_set_ellipsize (self->pl, 1074 pango_layout_set_ellipsize (self->pl,
841 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1075 ellipsise == 1 ? PANGO_ELLIPSIZE_START
842 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1076 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1077 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
844 : PANGO_ELLIPSIZE_NONE 1078 : PANGO_ELLIPSIZE_NONE
845 ); 1079 );
846 1080
847void 1081void
848set_single_paragraph_mode (CFClient::Layout self, int spm) 1082set_single_paragraph_mode (CFPlus::Layout self, int spm)
849 CODE: 1083 CODE:
850 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1084 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851 1085
852void 1086void
853size (CFClient::Layout self) 1087size (CFPlus::Layout self)
854 PPCODE: 1088 PPCODE:
855{ 1089{
856 int w, h; 1090 int w, h;
857 1091
858 layout_get_pixel_size (self, &w, &h); 1092 layout_get_pixel_size (self, &w, &h);
861 PUSHs (sv_2mortal (newSViv (w))); 1095 PUSHs (sv_2mortal (newSViv (w)));
862 PUSHs (sv_2mortal (newSViv (h))); 1096 PUSHs (sv_2mortal (newSViv (h)));
863} 1097}
864 1098
865int 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
866xy_to_index (CFClient::Layout self, int x, int y) 1112xy_to_index (CFPlus::Layout self, int x, int y)
867 CODE: 1113 CODE:
868{ 1114{
869 int index, trailing; 1115 int index, trailing;
870 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);
871 RETVAL = index; 1117 RETVAL = index + trailing;
872} 1118}
873 OUTPUT: 1119 OUTPUT:
874 RETVAL 1120 RETVAL
875 1121
876void 1122void
877cursor_pos (CFClient::Layout self, int index) 1123cursor_pos (CFPlus::Layout self, int index)
878 PPCODE: 1124 PPCODE:
879{ 1125{
880 PangoRectangle strong_pos; 1126 PangoRectangle strong_pos;
881 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1127 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882 1128
885 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887} 1133}
888 1134
889void 1135void
890render (CFClient::Layout self) 1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
891 PPCODE: 1137 PPCODE:
892{ 1138{
893 SV *retval; 1139 int line, x;
894 int w, h;
895 1140
896 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 */
897 1143
898 if (self->rgba)
899 {
900 cairo_surface_t *surface;
901 cairo_t *cairo;
902
903 retval = newSV (w * h * 4);
904 SvPOK_only (retval);
905 SvCUR_set (retval, w * h * 4);
906
907 memset (SvPVX (retval), 0, w * h * 4);
908
909 surface = cairo_image_surface_create_for_data (
910 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911 cairo = cairo_create (surface);
912 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914 pango_cairo_show_layout (cairo, self->pl);
915
916 cairo_destroy (cairo);
917 cairo_surface_destroy (surface);
918
919 // what a mess, and its premultiplied, too :(
920 {
921 uint32_t *p = (uint32_t *)SvPVX (retval);
922 uint32_t *e = p + w * h;
923
924 while (p < e)
925 {
926 uint32_t rgba = *p;
927 rgba = (rgba >> 24) | (rgba << 8);
928#if 0
929#ifdef _WIN32
930 {//D
931 uint8_t r = rgba >> 24;
932 uint8_t g = rgba >> 16;
933 uint8_t b = rgba >> 8;
934 uint8_t a = rgba >> 0;
935
936 rgba = (rgba & 0xffffff00) | a;
937 }
938#endif
939#endif
940 rgba = SDL_SwapBE32 (rgba);
941 *p++ = rgba;
942 }
943 }
944
945 EXTEND (SP, 5); 1144 EXTEND (SP, 2);
946 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)
947 PUSHs (sv_2mortal (newSViv (h))); 1166 PUSHs (sv_2mortal (newSViv (index + trailing)));
948 PUSHs (sv_2mortal (retval));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951 }
952 else 1167 else
953 { 1168 {
954 FT_Bitmap bitmap;
955
956 retval = newSV (w * h);
957 SvPOK_only (retval);
958 SvCUR_set (retval, w * h);
959
960 bitmap.rows = h;
961 bitmap.width = w;
962 bitmap.pitch = w;
963 bitmap.buffer = (unsigned char*)SvPVX (retval);
964 bitmap.num_grays = 256;
965 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967 memset (bitmap.buffer, 0, w * h);
968
969 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971 EXTEND (SP, 5);
972 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (index)));
973 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (trailing)));
974 PUSHs (sv_2mortal (retval));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977 } 1171 }
978} 1172}
979 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
980MODULE = CFClient PACKAGE = CFClient::Texture 1184MODULE = CFPlus PACKAGE = CFPlus::Texture
981 1185
982void 1186void
1187pad2pot (SV *data_, SV *w_, SV *h_)
1188 CODE:
1189{
1190 int ow = SvIV (w_);
1191 int oh = SvIV (h_);
1192
1193 if (ow && oh)
1194 {
1195 int nw = minpot (ow);
1196 int nh = minpot (oh);
1197
1198 if (nw != ow || nh != oh)
1199 {
1200 if (SvOK (data_))
1201 {
1202 STRLEN datalen;
1203 char *data = SvPVbyte (data_, datalen);
1204 int bpp = datalen / (ow * oh);
1205 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1206
1207 SvPOK_only (result_);
1208 SvCUR_set (result_, nw * nh * bpp);
1209
1210 memset (SvPVX (result_), 0, nw * nh * bpp);
1211 while (oh--)
1212 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1213
1214 sv_setsv (data_, result_);
1215 }
1216
1217 sv_setiv (w_, nw);
1218 sv_setiv (h_, nh);
1219 }
1220 }
1221}
1222
1223void
983draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1224draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984 PROTOTYPE: $$$;$$ 1225 PROTOTYPE: $$$;$$
985 ALIAS: 1226 ALIAS:
986 draw_quad_alpha = 1 1227 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1228 draw_quad_alpha_premultiplied = 2
988 CODE: 1229 CODE:
1026 glDisable (GL_ALPHA_TEST); 1267 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1268 glDisable (GL_BLEND);
1028 } 1269 }
1029} 1270}
1030 1271
1031MODULE = CFClient PACKAGE = CFClient::Map 1272MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1273
1033CFClient::Map 1274CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1275new (SV *class)
1035 CODE: 1276 CODE:
1036 New (0, RETVAL, 1, struct map); 1277 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1278 RETVAL->x = 0;
1038 RETVAL->y = 0; 1279 RETVAL->y = 0;
1039 RETVAL->w = map_width; 1280 RETVAL->w = 0;
1040 RETVAL->h = map_height; 1281 RETVAL->h = 0;
1041 RETVAL->ox = 0; 1282 RETVAL->ox = 0;
1042 RETVAL->oy = 0; 1283 RETVAL->oy = 0;
1043 RETVAL->faces = 8192; 1284 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1044 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1285 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1045 RETVAL->texs = 8192;
1046 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1047 RETVAL->rows = 0; 1286 RETVAL->rows = 0;
1048 RETVAL->row = 0; 1287 RETVAL->row = 0;
1049 OUTPUT: 1288 OUTPUT:
1050 RETVAL 1289 RETVAL
1051 1290
1052void 1291void
1053DESTROY (CFClient::Map self) 1292DESTROY (CFPlus::Map self)
1054 CODE: 1293 CODE:
1055{ 1294{
1056 map_clear (self); 1295 map_clear (self);
1057 Safefree (self->face); 1296 Safefree (self->face2tile);
1297 Safefree (self->tex);
1058 Safefree (self); 1298 Safefree (self);
1059} 1299}
1060 1300
1061void 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
1062clear (CFClient::Map self) 1308clear (CFPlus::Map self)
1063 CODE: 1309 CODE:
1064 map_clear (self); 1310 map_clear (self);
1065 1311
1066void 1312void
1067set_face (CFClient::Map self, int face, int texid) 1313set_tileid (CFPlus::Map self, int face, int tile)
1068 CODE: 1314 CODE:
1069{ 1315{
1070 while (self->faces <= face) 1316 need_facenum (self, face); self->face2tile [face] = tile;
1071 { 1317 need_texid (self, tile);
1072 Append (mapface, self->face, self->faces, self->faces);
1073 self->faces *= 2;
1074 }
1075
1076 self->face [face] = texid;
1077} 1318}
1078 1319
1079void 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
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1081 CODE: 1345 CODE:
1082{ 1346{
1083 while (self->texs <= texid) 1347 need_texid (self, texid);
1084 {
1085 Append (maptex, self->tex, self->texs, self->texs);
1086 self->texs *= 2;
1087 }
1088 1348
1089 { 1349 {
1090 maptex *tex = self->tex + texid; 1350 maptex *tex = self->tex + texid;
1091 1351
1092 tex->name = name; 1352 tex->name = name;
1109 // from transparent color bleeding and ugly wrapping effects. 1369 // from transparent color bleeding and ugly wrapping effects.
1110 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1370 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111} 1371}
1112 1372
1113int 1373int
1114ox (CFClient::Map self) 1374ox (CFPlus::Map self)
1115 ALIAS: 1375 ALIAS:
1116 oy = 1 1376 oy = 1
1117 x = 2 1377 x = 2
1118 y = 3 1378 y = 3
1119 w = 4 1379 w = 4
1130 } 1390 }
1131 OUTPUT: 1391 OUTPUT:
1132 RETVAL 1392 RETVAL
1133 1393
1134void 1394void
1135scroll (CFClient::Map self, int dx, int dy) 1395scroll (CFPlus::Map self, int dx, int dy)
1136 CODE: 1396 CODE:
1137{ 1397{
1138 if (dx > 0) 1398 if (dx > 0)
1139 map_blank (self, self->x, self->y, dx - 1, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1140 else if (dx < 0) 1400 else if (dx < 0)
1141 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);
1142 1402
1143 if (dy > 0) 1403 if (dy > 0)
1144 map_blank (self, self->x, self->y, self->w, dy - 1); 1404 map_blank (self, self->x, self->y, self->w, dy);
1145 else if (dy < 0) 1405 else if (dy < 0)
1146 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);
1147 1407
1148 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1149 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1150 1410
1151 while (self->y < 0) 1411 while (self->y < 0)
1156 self->y += MAP_EXTEND_Y; 1416 self->y += MAP_EXTEND_Y;
1157 } 1417 }
1158} 1418}
1159 1419
1160void 1420void
1161map1a_update (CFClient::Map self, SV *data_) 1421map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162 CODE: 1422 CODE:
1163{ 1423{
1164 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1424 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165 uint8_t *data_end = (uint8_t *)SvEND (data_); 1425 uint8_t *data_end = (uint8_t *)SvEND (data_);
1166 mapcell *cell; 1426 mapcell *cell;
1167 int x, y, flags; 1427 int x, y, flags;
1168 1428
1169 while (data < data_end) 1429 while (data < data_end - 1)
1170 { 1430 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1431 flags = (data [0] << 8) + data [1]; data += 2;
1172 1432
1173 x = ((flags >> 10) & 63) + self->x; 1433 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1434 y = self->y + ((flags >> 4) & 63);
1175 1435
1176 cell = map_get_cell (self, x, y); 1436 cell = map_get_cell (self, x, y);
1177 1437
1178 if (flags & 15) 1438 if (flags & 15)
1179 { 1439 {
1180 if (cell->darkness < 0) 1440 if (!cell->darkness)
1181 { 1441 {
1442 memset (cell, 0, sizeof (*cell));
1182 cell->darkness = 0; 1443 cell->darkness = 256;
1183 cell->face [0] = 0;
1184 cell->face [1] = 0;
1185 cell->face [2] = 0;
1186 } 1444 }
1187 1445
1188 cell->darkness = flags & 8 ? *data++ : 255;
1189
1190 //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 }
1191 1487
1192 if (flags & 4) 1488 if (flags & 4)
1193 { 1489 {
1194 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];
1195 } 1493 }
1196 1494
1197 if (flags & 2) 1495 if (flags & 2)
1198 { 1496 {
1199 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];
1200 } 1500 }
1201 1501
1202 if (flags & 1) 1502 if (flags & 1)
1203 { 1503 {
1204 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];
1205 } 1507 }
1206 } 1508 }
1207 else 1509 else
1208 cell->darkness = -1; 1510 cell->darkness = 0;
1209 } 1511 }
1210} 1512}
1211 1513
1212SV * 1514SV *
1213mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1515mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214 CODE: 1516 CODE:
1215{ 1517{
1216 int x1, x; 1518 int x1, x;
1217 int y1, y; 1519 int y1, y;
1218 int z; 1520 int z;
1239 { 1541 {
1240 mapcell *cell = row->col + (x - row->c0); 1542 mapcell *cell = row->col + (x - row->c0);
1241 1543
1242 for (z = 0; z <= 0; z++) 1544 for (z = 0; z <= 0; z++)
1243 { 1545 {
1244 mapface face = cell->face [z];
1245
1246 if (face)
1247 {
1248 maptex tex = self->tex [face]; 1546 maptex tex = self->tex [cell->tile [z]];
1249 int a0 = 255 - tex.a; 1547 int a0 = 255 - tex.a;
1250 int a1 = tex.a; 1548 int a1 = tex.a;
1251 1549
1252 r = (r * a0 + tex.r * a1) / 255; 1550 r = (r * a0 + tex.r * a1) / 255;
1253 g = (g * a0 + tex.g * a1) / 255; 1551 g = (g * a0 + tex.g * a1) / 255;
1254 b = (b * a0 + tex.b * a1) / 255; 1552 b = (b * a0 + tex.b * a1) / 255;
1255 a = (a * a0 + tex.a * a1) / 255; 1553 a = (a * a0 + tex.a * a1) / 255;
1256 }
1257 } 1554 }
1258 } 1555 }
1259 1556
1260 *map++ = (r ) 1557 *map++ = (r )
1261 | (g << 8) 1558 | (g << 8)
1268} 1565}
1269 OUTPUT: 1566 OUTPUT:
1270 RETVAL 1567 RETVAL
1271 1568
1272void 1569void
1273draw (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)
1274 PPCODE: 1571 CODE:
1275{ 1572{
1276 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;
1277 int x, y, z; 1577 int x, y, z;
1278 int last_name; 1578 int last_name;
1279 mapface face; 1579
1580 // thats current max. sorry.
1581 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255;
1583
1584 // clear key, in case of extra padding
1585 memset (&skey, 0, sizeof (skey));
1586
1587 glColor4ub (255, 255, 255, 255);
1588
1589 glEnable (GL_BLEND);
1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1591 glEnable (GL_TEXTURE_2D);
1592 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1593
1594 glBegin (GL_QUADS);
1595
1596 last_name = 0;
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 memset (smooth_level, 0, sizeof (smooth_level));
1606
1607 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows)
1609 {
1610 maprow *row = self->row + (y + my);
1611
1612 for (x = 0; x < sw; x++)
1613 if (row->c0 <= x + mx && x + mx < row->c1)
1614 {
1615 mapcell *cell = row->col + (x + mx - row->c0);
1616
1617 smooth_max[x + 1][y + 1] =
1618 MAX (self->tex [cell->tile [0]].smoothlevel,
1619 MAX (self->tex [cell->tile [1]].smoothlevel,
1620 self->tex [cell->tile [2]].smoothlevel));
1621 }
1622 }
1623
1624 for (z = 0; z <= 2; z++)
1625 {
1626 for (y = 0; y < sh; y++)
1627 if (0 <= y + my && y + my < self->rows)
1628 {
1629 maprow *row = self->row + (y + my);
1630
1631 for (x = 0; x < sw; x++)
1632 if (row->c0 <= x + mx && x + mx < row->c1)
1633 {
1634 mapcell *cell = row->col + (x + mx - row->c0);
1635 tileid tile = cell->tile [z];
1636
1637 if (tile)
1638 {
1639 maptex tex = self->tex [tile];
1640 int px = (x + 1) * T - tex.w;
1641 int py = (y + 1) * T - tex.h;
1642
1643 // suppressing texture state switches here
1644 // is only moderately effective, but worth the extra effort
1645 if (last_name != tex.name)
1646 {
1647 if (!tex.name)
1648 tex = self->tex [2]; /* missing, replace by noface */
1649
1650 glEnd ();
1651 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1652 glBegin (GL_QUADS);
1653 }
1654
1655 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1656 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1657 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1658 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1659
1660 if (cell->flags && z == 2)
1661 {
1662 if (cell->flags & 1)
1663 {
1664 maptex tex = self->tex [1];
1665 int px = x * T + T * 2 / 32;
1666 int py = y * T - T * 6 / 32;
1667
1668 glEnd ();
1669 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1670 glBegin (GL_QUADS);
1671
1672 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1673 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1674 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1675 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1676 }
1677 }
1678
1679 // update smooth hash
1680 if (tex.smoothtile)
1681 {
1682 skey.tile = tex.smoothtile;
1683 skey.level = tex.smoothlevel;
1684
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686
1687 // add bits to current tile and all neighbours. skey.x|y is
1688 // shifted +1|+1 so we always stay positive.
1689
1690 // bits is ___n cccc CCCC bbbb
1691 // n do not draw borders&corners
1692 // c draw these corners, but...
1693 // C ... not these
1694 // b draw these borders
1695
1696 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1697 // ┃· ·· ·┃ ━━
1698
1699 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1700 // ·· ·· ·┏ ┓·
1701
1702 // full tile
1703 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1704
1705 // borders
1706 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1707 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1708 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1709 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1710
1711 // corners
1712 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1713 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1714 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1715 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1716 }
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))
1733 {
1734 int level = (w << 5) | b;
1735 HE *he;
1736
1737 hv_iterinit (smooth);
1738 while ((he = hv_iternext (smooth)))
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
1762 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
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 }
1787 }
1788 }
1789 }
1790 }
1791
1792 //hv_clear (smooth);
1793
1794 glEnd ();
1795
1796 glDisable (GL_TEXTURE_2D);
1797 glDisable (GL_BLEND);
1798
1799 // top layer: overlays such as the health bar
1800 for (y = 0; y < sh; y++)
1801 if (0 <= y + my && y + my < self->rows)
1802 {
1803 maprow *row = self->row + (y + my);
1804
1805 for (x = 0; x < sw; x++)
1806 if (row->c0 <= x + mx && x + mx < row->c1)
1807 {
1808 mapcell *cell = row->col + (x + mx - row->c0);
1809
1810 int px = x * T;
1811 int py = y * T;
1812
1813 if (cell->stat_hp)
1814 {
1815 int width = cell->stat_width * T;
1816 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1817
1818 glColor3ub (0, 0, 0);
1819 glRectf (px + 1, py - thick - 2,
1820 px + width - 1, py);
1821
1822 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1823 glRectf (px + 2,
1824 py - thick - 1,
1825 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1826 }
1827 }
1828 }
1829}
1830
1831void
1832draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1833 CODE:
1834{
1835 static float color[16][3] = {
1836 { 0.00F, 0.00F, 0.00F },
1837 { 1.00F, 1.00F, 1.00F },
1838 { 0.00F, 0.00F, 0.55F },
1839 { 1.00F, 0.00F, 0.00F },
1840
1841 { 1.00F, 0.54F, 0.00F },
1842 { 0.11F, 0.56F, 1.00F },
1843 { 0.93F, 0.46F, 0.00F },
1844 { 0.18F, 0.54F, 0.34F },
1845
1846 { 0.56F, 0.73F, 0.56F },
1847 { 0.80F, 0.80F, 0.80F },
1848 { 0.55F, 0.41F, 0.13F },
1849 { 0.99F, 0.77F, 0.26F },
1850
1851 { 0.74F, 0.65F, 0.41F },
1852
1853 { 0.00F, 1.00F, 1.00F },
1854 { 1.00F, 0.00F, 1.00F },
1855 { 1.00F, 1.00F, 0.00F },
1856 };
1857
1858 int x, y;
1859
1860 glEnable (GL_TEXTURE_2D);
1861 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1862 glEnable (GL_BLEND);
1863 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1864 glBegin (GL_QUADS);
1865
1866 for (y = 0; y < h; y++)
1867 for (x = 0; x < w; x++)
1868 {
1869 unsigned char m = data [x + y * w];
1870
1871 if (m)
1872 {
1873 float *c = color [m & 15];
1874
1875 float tx1 = m & 0x40 ? 0.5 : 0.;
1876 float tx2 = tx1 + 0.5;
1877
1878 glColor4f (c[0], c[1], c[2], 0.75);
1879 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1880 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1881 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1882 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1883 }
1884 }
1885
1886 glEnd ();
1887 glDisable (GL_BLEND);
1888 glDisable (GL_TEXTURE_2D);
1889}
1890
1891void
1892fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1893 PPCODE:
1894{
1895 int x, y;
1280 int sw4 = (sw + 3) & ~3; 1896 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1897 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1898 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1899
1284 memset (darkness, 255, sw4 * sh); 1900 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv); 1901 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh); 1902 SvCUR_set (darkness_sv, sw4 * sh);
1287 1903
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1904 mx += self->x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1905 my += self->y;
1290 1906
1291 /*
1292 int vx = self->vx = self->w >= sw
1293 ? self->x + (self->w - sw) / 2
1294 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1295
1296 int vy = self->vy = self->h >= sh
1297 ? self->y + (self->h - sh) / 2
1298 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299 */
1300
1301 glColor4ub (255, 255, 255, 255);
1302
1303 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304 glEnable (GL_BLEND);
1305 glEnable (GL_TEXTURE_2D);
1306 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307
1308 glBegin (GL_QUADS);
1309
1310 last_name = 0;
1311
1312 for (z = 0; z < 3; z++)
1313 for (y = 0; y < sh; y++) 1907 for (y = 0; y < sh; y++)
1314 if (0 <= y + vy && y + vy < self->rows) 1908 if (0 <= y + my && y + my < self->rows)
1315 { 1909 {
1316 maprow *row = self->row + (y + vy); 1910 maprow *row = self->row + (y + my);
1317 1911
1318 for (x = 0; x < sw; x++) 1912 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1913 if (row->c0 <= x + mx && x + mx < row->c1)
1320 { 1914 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1915 mapcell *cell = row->col + (x + mx - row->c0);
1322 1916
1323 darkness[y * sw4 + x] = cell->darkness < 0 1917 darkness[y * sw4 + x] = cell->darkness
1918 ? 255 - (cell->darkness - 1)
1324 ? 255 - FOW_DARKNESS 1919 : 255 - FOW_DARKNESS;
1325 : 255 - cell->darkness;
1326
1327 face = cell->face [z];
1328
1329 if (face)
1330 {
1331 maptex tex = self->tex [face];
1332
1333 int px = (x + 1) * 32 - tex.w;
1334 int py = (y + 1) * 32 - tex.h;
1335
1336 if (last_name != tex.name)
1337 {
1338 glEnd ();
1339 last_name = tex.name;
1340 glBindTexture (GL_TEXTURE_2D, last_name);
1341 glBegin (GL_QUADS);
1342 }
1343
1344 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348 }
1349 } 1920 }
1350 } 1921 }
1351
1352 glEnd ();
1353
1354 glDisable (GL_TEXTURE_2D);
1355 glDisable (GL_BLEND);
1356 1922
1357 EXTEND (SP, 3); 1923 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1924 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1925 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1926 PUSHs (darkness_sv);
1361} 1927}
1362 1928
1363SV * 1929SV *
1364get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1930get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365 CODE: 1931 CODE:
1366{ 1932{
1367 int x, y, x1, y1; 1933 int x, y, x1, y1;
1368 SV *data_sv = newSV (w * h * 7 + 5); 1934 SV *data_sv = newSV (w * h * 7 + 5);
1369 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1935 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1394 if (row && row->c0 <= x && x < row->c1) 1960 if (row && row->c0 <= x && x < row->c1)
1395 { 1961 {
1396 mapcell *cell = row->col + (x - row->c0); 1962 mapcell *cell = row->col + (x - row->c0);
1397 uint8_t flags = 0; 1963 uint8_t flags = 0;
1398 1964
1399 if (cell->face [0]) flags |= 1; 1965 if (cell->tile [0]) flags |= 1;
1400 if (cell->face [1]) flags |= 2; 1966 if (cell->tile [1]) flags |= 2;
1401 if (cell->face [2]) flags |= 4; 1967 if (cell->tile [2]) flags |= 4;
1402 1968
1403 *data++ = flags; 1969 *data++ = flags;
1404 1970
1405 if (flags & 1) 1971 if (flags & 1)
1406 { 1972 {
1973 tileid tile = cell->tile [0];
1407 *data++ = cell->face [0] >> 8; 1974 *data++ = tile >> 8;
1408 *data++ = cell->face [0]; 1975 *data++ = tile;
1409 } 1976 }
1410 1977
1411 if (flags & 2) 1978 if (flags & 2)
1412 { 1979 {
1980 tileid tile = cell->tile [1];
1413 *data++ = cell->face [1] >> 8; 1981 *data++ = tile >> 8;
1414 *data++ = cell->face [1]; 1982 *data++ = tile;
1415 } 1983 }
1416 1984
1417 if (flags & 4) 1985 if (flags & 4)
1418 { 1986 {
1987 tileid tile = cell->tile [2];
1419 *data++ = cell->face [2] >> 8; 1988 *data++ = tile >> 8;
1420 *data++ = cell->face [2]; 1989 *data++ = tile;
1421 } 1990 }
1422 } 1991 }
1423 else 1992 else
1424 *data++ = 0; 1993 *data++ = 0;
1425 } 1994 }
1431} 2000}
1432 OUTPUT: 2001 OUTPUT:
1433 RETVAL 2002 RETVAL
1434 2003
1435void 2004void
1436set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2005set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437 PPCODE: 2006 PPCODE:
1438{ 2007{
1439 int x, y, z; 2008 int x, y, z;
1440 int w, h; 2009 int w, h;
1441 int x1, y1; 2010 int x1, y1;
1465 { 2034 {
1466 uint8_t flags = *data++; 2035 uint8_t flags = *data++;
1467 2036
1468 if (flags) 2037 if (flags)
1469 { 2038 {
1470 mapface face[3] = { 0, 0, 0 };
1471
1472 mapcell *cell = row_get_cell (row, x); 2039 mapcell *cell = row_get_cell (row, x);
2040 tileid tile[3] = { 0, 0, 0 };
1473 2041
1474 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2042 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1475 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2043 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1476 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2044 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1477 2045
1478 if (cell->darkness <= 0) 2046 if (cell->darkness == 0)
1479 { 2047 {
1480 cell->darkness = -1; 2048 cell->darkness = 0;
1481 2049
1482 for (z = 0; z <= 2; z++) 2050 for (z = 0; z <= 2; z++)
1483 { 2051 {
1484 cell->face[z] = face[z]; 2052 tileid t = tile [z];
1485 2053
1486 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2054 if (t >= self->texs || (t && !self->tex [t].name))
2055 {
1487 XPUSHs (sv_2mortal (newSViv (face[z]))); 2056 XPUSHs (sv_2mortal (newSViv (t)));
2057 need_texid (self, t);
2058 }
2059
2060 cell->tile [z] = t;
1488 } 2061 }
1489 } 2062 }
1490 } 2063 }
1491 } 2064 }
1492 } 2065 }
1493} 2066}
1494 2067
1495MODULE = CFClient PACKAGE = CFClient::MixChunk 2068MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496 2069
1497CFClient::MixChunk 2070CFPlus::MixChunk
1498new_from_file (SV *class, char *path) 2071new_from_file (SV *class, char *path)
1499 CODE: 2072 CODE:
1500 RETVAL = Mix_LoadWAV (path); 2073 RETVAL = Mix_LoadWAV (path);
1501 OUTPUT: 2074 OUTPUT:
1502 RETVAL 2075 RETVAL
1503 2076
1504void 2077void
1505DESTROY (CFClient::MixChunk self) 2078DESTROY (CFPlus::MixChunk self)
1506 CODE: 2079 CODE:
1507 Mix_FreeChunk (self); 2080 Mix_FreeChunk (self);
1508 2081
1509int 2082int
1510volume (CFClient::MixChunk self, int volume = -1) 2083volume (CFPlus::MixChunk self, int volume = -1)
1511 CODE: 2084 CODE:
1512 RETVAL = Mix_VolumeChunk (self, volume); 2085 RETVAL = Mix_VolumeChunk (self, volume);
1513 OUTPUT: 2086 OUTPUT:
1514 RETVAL 2087 RETVAL
1515 2088
1516int 2089int
1517play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2090play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518 CODE: 2091 CODE:
1519 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2092 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520 OUTPUT: 2093 OUTPUT:
1521 RETVAL 2094 RETVAL
1522 2095
1523MODULE = CFClient PACKAGE = CFClient::MixMusic 2096MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524 2097
1525int 2098int
1526volume (int volume = -1) 2099volume (int volume = -1)
1527 CODE: 2100 CODE:
1528 RETVAL = Mix_VolumeMusic (volume); 2101 RETVAL = Mix_VolumeMusic (volume);
1529 OUTPUT: 2102 OUTPUT:
1530 RETVAL 2103 RETVAL
1531 2104
1532CFClient::MixMusic 2105CFPlus::MixMusic
1533new_from_file (SV *class, char *path) 2106new_from_file (SV *class, char *path)
1534 CODE: 2107 CODE:
1535 RETVAL = Mix_LoadMUS (path); 2108 RETVAL = Mix_LoadMUS (path);
1536 OUTPUT: 2109 OUTPUT:
1537 RETVAL 2110 RETVAL
1538 2111
1539void 2112void
1540DESTROY (CFClient::MixMusic self) 2113DESTROY (CFPlus::MixMusic self)
1541 CODE: 2114 CODE:
1542 Mix_FreeMusic (self); 2115 Mix_FreeMusic (self);
1543 2116
1544int 2117int
1545play (CFClient::MixMusic self, int loops = -1) 2118play (CFPlus::MixMusic self, int loops = -1)
1546 CODE: 2119 CODE:
1547 RETVAL = Mix_PlayMusic (self, loops); 2120 RETVAL = Mix_PlayMusic (self, loops);
1548 OUTPUT: 2121 OUTPUT:
1549 RETVAL 2122 RETVAL
1550 2123
1551MODULE = CFClient PACKAGE = CFClient::OpenGL 2124MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552 2125
1553BOOT: 2126BOOT:
1554{ 2127{
1555 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2128 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556 static const struct { 2129 static const struct {
1557 const char *name; 2130 const char *name;
1558 IV iv; 2131 IV iv;
1559 } *civ, const_iv[] = { 2132 } *civ, const_iv[] = {
1560# define const_iv(name) { # name, (IV)name } 2133# define const_iv(name) { # name, (IV)name }
1567 const_iv (GL_SCISSOR_TEST), 2140 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 2141 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 2142 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 2143 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 2144 const_iv (GL_RESCALE_NORMAL),
2145 const_iv (GL_FRONT),
2146 const_iv (GL_BACK),
1572 const_iv (GL_AND), 2147 const_iv (GL_AND),
1573 const_iv (GL_ONE), 2148 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 2149 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 2150 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 2151 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2152 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 2153 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 2154 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 2155 const_iv (GL_RGB),
1581 const_iv (GL_RGBA), 2156 const_iv (GL_RGBA),
2157 const_iv (GL_RGBA4),
2158 const_iv (GL_RGBA8),
2159 const_iv (GL_RGB5_A1),
1582 const_iv (GL_UNSIGNED_BYTE), 2160 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 2161 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 2162 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 2163 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 2164 const_iv (GL_INTENSITY),
1618 const_iv (GL_SEPARABLE_2D), 2196 const_iv (GL_SEPARABLE_2D),
1619 const_iv (GL_CONVOLUTION_2D), 2197 const_iv (GL_CONVOLUTION_2D),
1620 const_iv (GL_CONVOLUTION_BORDER_MODE), 2198 const_iv (GL_CONVOLUTION_BORDER_MODE),
1621 const_iv (GL_CONSTANT_BORDER), 2199 const_iv (GL_CONSTANT_BORDER),
1622 const_iv (GL_LINES), 2200 const_iv (GL_LINES),
2201 const_iv (GL_LINE_STRIP),
1623 const_iv (GL_LINE_LOOP), 2202 const_iv (GL_LINE_LOOP),
1624 const_iv (GL_QUADS), 2203 const_iv (GL_QUADS),
1625 const_iv (GL_QUAD_STRIP), 2204 const_iv (GL_QUAD_STRIP),
1626 const_iv (GL_TRIANGLES), 2205 const_iv (GL_TRIANGLES),
1627 const_iv (GL_TRIANGLE_STRIP), 2206 const_iv (GL_TRIANGLE_STRIP),
1660 OUTPUT: 2239 OUTPUT:
1661 RETVAL 2240 RETVAL
1662 2241
1663int glGetError () 2242int glGetError ()
1664 2243
2244void glFinish ()
2245
1665void glClear (int mask) 2246void glClear (int mask)
1666 2247
1667void glClearColor (float r, float g, float b, float a = 1.0) 2248void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 2249 PROTOTYPE: @
1669 2250
1692void glPushMatrix () 2273void glPushMatrix ()
1693 2274
1694void glPopMatrix () 2275void glPopMatrix ()
1695 2276
1696void glLoadIdentity () 2277void glLoadIdentity ()
2278
2279void glDrawBuffer (int buffer)
2280
2281void glReadBuffer (int buffer)
1697 2282
1698# near_ and far_ are due to microsofts buggy "c" compiler 2283# near_ and far_ are due to microsofts buggy "c" compiler
1699void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2284void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700 2285
1701# near_ and far_ are due to microsofts buggy "c" compiler 2286# near_ and far_ are due to microsofts buggy "c" compiler
1731 r *= a; 2316 r *= a;
1732 g *= a; 2317 g *= a;
1733 b *= a; 2318 b *= a;
1734 } 2319 }
1735 // microsoft visual "c" rounds instead of truncating... 2320 // microsoft visual "c" rounds instead of truncating...
1736 glColor4ub (MIN ((int)(r * 256.f), 255), 2321 glColor4f (r, g, b, a);
1737 MIN ((int)(g * 256.f), 255),
1738 MIN ((int)(b * 256.f), 255),
1739 MIN ((int)(a * 256.f), 255));
1740 2322
1741void glInterleavedArrays (int format, int stride, char *data) 2323void glInterleavedArrays (int format, int stride, char *data)
1742 2324
1743void glDrawElements (int mode, int count, int type, char *indices) 2325void glDrawElements (int mode, int count, int type, char *indices)
1744 2326
1792 2374
1793int glGenTexture () 2375int glGenTexture ()
1794 CODE: 2376 CODE:
1795{ 2377{
1796 GLuint name; 2378 GLuint name;
2379 if (AvFILL (texture_av) >= 0)
2380 name = (GLuint)av_pop (texture_av);
2381 else
1797 glGenTextures (1, &name); 2382 glGenTextures (1, &name);
1798 RETVAL = name; 2383 RETVAL = name;
1799} 2384}
1800 OUTPUT: 2385 OUTPUT:
1801 RETVAL 2386 RETVAL
1802 2387
1803void glDeleteTexture (int name) 2388void glDeleteTexture (int name)
1804 CODE: 2389 CODE:
1805{ 2390{
1806 GLuint name_ = name; 2391 /* make a half-assed attempt at returning the memory used by the texture */
2392 /* textures are frequently being reused by cfplus anyway */
2393 glBindTexture (GL_TEXTURE_2D, name);
2394 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2395 av_push (texture_av, (SV *)name);
1807 glDeleteTextures (1, &name_); 2396 /*glDeleteTextures (1, &name_);*/
1808} 2397}
1809 2398
1810int glGenList () 2399int glGenList ()
1811 CODE: 2400 CODE:
1812 RETVAL = glGenLists (1); 2401 RETVAL = glGenLists (1);
1821 2410
1822void glEndList () 2411void glEndList ()
1823 2412
1824void glCallList (int list) 2413void glCallList (int list)
1825 2414
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines