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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.178 by root, Tue Apr 10 11:12:53 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines