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.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.185 by root, Sat Apr 21 09:21:03 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines