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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines