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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines