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.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.168 by root, Sat Dec 9 21:26:45 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# include <wininet.h>
7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
3#endif 9#endif
4 10
5#include "EXTERN.h" 11#include "EXTERN.h"
6#include "perl.h" 12#include "perl.h"
7#include "XSUB.h" 13#include "XSUB.h"
8 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
20#include <math.h>
9#include <string.h> 21#include <string.h>
10#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
11 24
12#include <SDL.h> 25#include <SDL.h>
26#include <SDL_endian.h>
13#include <SDL_image.h> 27#include <SDL_image.h>
14#include <SDL_mixer.h> 28#include <SDL_mixer.h>
15#include <SDL_opengl.h> 29#include <SDL_opengl.h>
16 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
17#include <glib/gmacros.h> 34#include <glib/gmacros.h>
18 35
19#include <pango/pango.h> 36#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 37
23#ifndef _WIN32 38#ifndef _WIN32
24# include <sys/types.h> 39# include <sys/types.h>
25# include <sys/socket.h> 40# include <sys/socket.h>
26# include <netinet/in.h> 41# include <netinet/in.h>
27# include <netinet/tcp.h> 42# include <netinet/tcp.h>
28# include <inttypes.h> 43# include <inttypes.h>
29#else
30 typedef unsigned char uint8_t;
31 typedef unsigned short uint16_t;
32 typedef unsigned int uint32_t;
33 typedef signed char int8_t;
34 typedef signed short int16_t;
35 typedef signed int int32_t;
36#endif 44#endif
37 45
38#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
39 47
40#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
41 49
42#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
44 52
45#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
46 54
47#define GL_CALL(type,func,args) \ 55#if 0
48 { \ 56# define PARACHUTE SDL_INIT_NOPARACHUTE
49 static int init_; \ 57#else
50 static type fptr_; \ 58# define PARACHUTE 0
51 \ 59#endif
52 if (!init_) \
53 { \
54 init_ = 1; \
55 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56 } \
57 \
58 if (fptr_) \
59 fptr_ args; \
60 }
61 60
61static struct
62{
63#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h"
65#undef GL_FUNC
66} gl;
67
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{
70 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else
75 glBlendFunc (sa, da);
76}
77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
62typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
63typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
64 86
65typedef 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}
66 106
67typedef struct cf_layout { 107typedef struct cf_layout {
68 PangoLayout *pl; 108 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode
69 int base_height; 110 int base_height;
70 CFClient__Font font; 111 CFPlus__Font font;
71} *CFClient__Layout; 112} *CFPlus__Layout;
72 113
73static CFClient__Font default_font; 114static CFPlus__Font default_font;
74static PangoContext *context; 115static PangoContext *opengl_context;
75static PangoFontMap *fontmap; 116static PangoFontMap *opengl_fontmap;
76 117
77static void 118static void
78substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
79{ 120{
80 FcPatternAddBool (pattern, FC_HINTING , 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
122#ifdef FC_HINT_STYLE
123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
124#endif
81 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82} 126}
83 127
84static void 128static void
85layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
86{ 130{
87 /* 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
88 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
89 */ 133 */
90 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
94 138
95 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
96} 140}
97 141
98static void 142static void
99layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
100{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
101 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
102 149
103 *w = (*w + 3) & ~3; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104 if (!*w) *w = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105 if (!*h) *h = 1; 152
153 if (!rect.width) rect.width = 1;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
106} 158}
107 159
108typedef uint16_t mapface; 160typedef uint16_t mapface;
109 161
110typedef struct { 162typedef struct {
113 float s, t; 165 float s, t;
114 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
115} maptex; 167} maptex;
116 168
117typedef struct { 169typedef struct {
118 int16_t darkness; 170 uint32_t player;
119 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
120} mapcell; 174} mapcell;
121 175
122typedef struct { 176typedef struct {
123 int32_t c0, c1; 177 int32_t c0, c1;
124 mapcell *col; 178 mapcell *col;
133 int texs; 187 int texs;
134 maptex *tex; 188 maptex *tex;
135 189
136 int32_t rows; 190 int32_t rows;
137 maprow *row; 191 maprow *row;
138} *CFClient__Map; 192} *CFPlus__Map;
139 193
140static char * 194static char *
141prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
142{ 196{
143 char *p; 197 char *p;
161 215
162#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))
163#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))
164 218
165static maprow * 219static maprow *
166map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
167{ 221{
168 if (0 > y) 222 if (0 > y)
169 { 223 {
170 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
171 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
209 263
210 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
211} 265}
212 266
213static mapcell * 267static mapcell *
214map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
215{ 269{
216 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
217} 271}
218 272
219static void 273static void
220map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
221{ 275{
222 int r; 276 int r;
223 277
224 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
225 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
233 self->row = 0; 287 self->row = 0;
234 self->rows = 0; 288 self->rows = 0;
235} 289}
236 290
237static void 291static void
238map_blank (CFClient__Map self, int x0, int y0, int w, int h) 292map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
239{ 293{
240 int x, y; 294 int x, y;
241 maprow *row; 295 maprow *row;
296 mapcell *cell;
242 297
243 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
244 if (y >= 0) 299 if (y >= 0)
245 { 300 {
246 if (y >= self->rows) 301 if (y >= self->rows)
252 if (x >= row->c0) 307 if (x >= row->c0)
253 { 308 {
254 if (x >= row->c1) 309 if (x >= row->c1)
255 break; 310 break;
256 311
257 row->col[x - row->c0].darkness = -1; 312 cell = row->col + x - row->c0;
313
314 cell->darkness = 0;
315 cell->stat_hp = 0;
316 cell->flags = 0;
317 cell->player = 0;
258 } 318 }
259 } 319 }
260} 320}
261 321
262static void 322static void
263music_finished () 323music_finished (void)
264{ 324{
265 SDL_UserEvent ev; 325 SDL_UserEvent ev;
266 326
267 ev.type = SDL_USEREVENT; 327 ev.type = SDL_USEREVENT;
268 ev.code = 0; 328 ev.code = 0;
277{ 337{
278 SDL_UserEvent ev; 338 SDL_UserEvent ev;
279 339
280 ev.type = SDL_USEREVENT; 340 ev.type = SDL_USEREVENT;
281 ev.code = 1; 341 ev.code = 1;
282 ev.data1 = channel; 342 ev.data1 = (void *)(long)channel;
283 ev.data2 = 0; 343 ev.data2 = 0;
284 344
285 SDL_PushEvent ((SDL_Event *)&ev); 345 SDL_PushEvent ((SDL_Event *)&ev);
286} 346}
287 347
348static unsigned int
349minpot (unsigned int n)
350{
351 if (!n)
352 return 0;
353
354 --n;
355
356 n |= n >> 1;
357 n |= n >> 2;
358 n |= n >> 4;
359 n |= n >> 8;
360 n |= n >> 16;
361
362 return n + 1;
363}
364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
368
288MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
289 370
290PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
291 372
292BOOT: 373BOOT:
293{ 374{
294 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
295 static const struct { 376 static const struct {
296 const char *name; 377 const char *name;
297 IV iv; 378 IV iv;
298 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
299# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
381 const_iv (SDLK_MODIFIER_MIN),
382 const_iv (SDLK_MODIFIER_MAX),
383
300 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
301 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
302 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
303 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
304 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
313 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
314 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
315 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
316 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
317 const_iv (SDL_USEREVENT), 401 const_iv (SDL_USEREVENT),
402
403 const_iv (SDL_APPINPUTFOCUS),
404 const_iv (SDL_APPMOUSEFOCUS),
405 const_iv (SDL_APPACTIVE),
406
318 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
319 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
320 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
321 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
322 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
377 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
378 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
379 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
380 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
381 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
382 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
383 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
384 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
385 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
386 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
387 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
388 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
389 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
390 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
391 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
392 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
393 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
394 const_iv (KMOD_CTRL),
395 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_ALT),
397 const_iv (KMOD_META)
398# undef const_iv 488# undef const_iv
399 }; 489 };
400 490
401 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 491 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
402 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
403 493
404 fontmap = pango_ft2_font_map_new (); 494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
405 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
406 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
407} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
408 503
409int 504int
505in_destruct ()
506 CODE:
507 RETVAL = PL_main_cv == Nullcv;
508 OUTPUT:
509 RETVAL
510
511NV floor (NV x)
512
513NV ceil (NV x)
514
515void
516pango_init ()
517 CODE:
518{
519 opengl_fontmap = pango_opengl_font_map_new ();
520 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
521 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
522}
523
524int
410SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 525SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
411 526
412void 527void
413SDL_Quit () 528SDL_Quit ()
414 529
415void 530void
421 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 536 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
422 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 537 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
423 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 538 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
424 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 539 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
425 540
541 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
542 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
543
426 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 544 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
427 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
428 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
429 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
430 548
431 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 549 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550#if SDL_VERSION_ATLEAST(1,2,10)
432 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 551 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
433 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 552 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553#endif
434 554
435 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
436 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
437 557
438 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
447 567
448 ++m; 568 ++m;
449 } 569 }
450} 570}
451 571
572char *
573SDL_GetError ()
574
452int 575int
453SDL_SetVideoMode (int w, int h, int fullscreen) 576SDL_SetVideoMode (int w, int h, int fullscreen)
454 CODE: 577 CODE:
455 RETVAL = !!SDL_SetVideoMode ( 578 RETVAL = !!SDL_SetVideoMode (
456 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 579 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
457 ); 580 );
581 if (RETVAL)
582 {
458 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 583 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
585# include "glfunc.h"
586# undef GL_FUNC
587 }
459 OUTPUT: 588 OUTPUT:
460 RETVAL 589 RETVAL
461 590
462void 591void
463SDL_GL_SwapBuffers () 592SDL_GL_SwapBuffers ()
593
594char *
595SDL_GetKeyName (int sym)
464 596
465void 597void
466SDL_PollEvent () 598SDL_PollEvent ()
467 PPCODE: 599 PPCODE:
468{ 600{
478 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
479 case SDL_KEYUP: 611 case SDL_KEYUP:
480 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
481 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
482 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 614 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
615 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
483 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
484 break; 617 break;
485 618
486 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
487 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
488 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 621 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
489 break; 622 break;
490 623
491 case SDL_MOUSEMOTION: 624 case SDL_MOUSEMOTION:
625 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
492 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 627 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
493 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 628 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
494 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 629 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
495 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 630 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
496 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 631 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
497 break; 632 break;
498 633
499 case SDL_MOUSEBUTTONDOWN: 634 case SDL_MOUSEBUTTONDOWN:
500 case SDL_MOUSEBUTTONUP: 635 case SDL_MOUSEBUTTONUP:
636 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
637
501 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 638 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
502 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 639 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
503 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 640 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
504 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 641 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505 break; 642 break;
643
644 case SDL_USEREVENT:
645 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
648 break;
506 } 649 }
507 650
508 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
509 } 652 }
510} 653}
511 654
512int 655int
513Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 656Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
514 POSTCALL: 657 POSTCALL:
515 Mix_HookMusicFinished (music_finished); 658 Mix_HookMusicFinished (music_finished);
516 Mix_ChannelFinished (channel_finished); 659 Mix_ChannelFinished (channel_finished);
517 660
518void 661void
526 CODE: 669 CODE:
527#ifndef _WIN32 670#ifndef _WIN32
528 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
529#endif 672#endif
530 673
531char * 674void
532gl_version () 675win32_proxy_info ()
533 CODE: 676 PPCODE:
534 RETVAL = (char *)glGetString (GL_VERSION); 677{
535 OUTPUT: 678#ifdef _WIN32
536 RETVAL 679 char buffer[2048];
680 DWORD buflen;
537 681
538char * 682 EXTEND (SP, 3);
539gl_extensions () 683
540 CODE: 684 buflen = sizeof (buffer);
541 RETVAL = (char *)glGetString (GL_EXTENSIONS); 685 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
542 OUTPUT: 686 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
543 RETVAL 687 {
688 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
689
690 buflen = sizeof (buffer);
691 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
692 {
693 PUSHs (newSVpv (buffer, 0));
694
695 buflen = sizeof (buffer);
696 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
697 PUSHs (newSVpv (buffer, 0));
698 }
699 }
700#endif
701}
544 702
545void 703void
546add_font (char *file) 704add_font (char *file)
547 CODE: 705 CODE:
548 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
549 707
550void 708void
551load_image_inline (SV *image_) 709load_image_inline (SV *image_)
552 ALIAS: 710 ALIAS:
553 load_image_file = 1 711 load_image_file = 1
595 753
596 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
597 755
598 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
599 757
758 SDL_LockSurface (surface2);
600 EXTEND (SP, 5); 759 EXTEND (SP, 6);
601 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
602 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
603 SDL_LockSurface (surface2);
604 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
605 SDL_UnlockSurface (surface2);
606 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 763 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
607 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
608 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
609 767
610 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
611 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
612} 770}
613 771
637} 795}
638 796
639void 797void
640error (char *message) 798error (char *message)
641 CODE: 799 CODE:
800 fprintf (stderr, "ERROR: %s\n", message);
642#ifdef _WIN32 801#ifdef _WIN32
643 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 802 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
803#endif
804
805void
806fatal (char *message)
807 CODE:
808 fprintf (stderr, "FATAL: %s\n", message);
809#ifdef _WIN32
810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
811#endif
812 _exit (1);
813
814void
815_exit (int retval = 0)
816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
644#else 819#else
645 fprintf (stderr, "ERROR: %s\n", message); 820 _exit (retval);
646#endif 821#endif
647 822
648void
649fatal (char *message)
650 CODE:
651#ifdef _WIN32
652 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
653#else
654 fprintf (stderr, "FATAL: %s\n", message);
655#endif
656 exit (1);
657
658MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
659 824
660CFClient::Font 825CFPlus::Font
661new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
662 CODE: 827 CODE:
663{ 828{
664 int count; 829 int count;
665 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
668} 833}
669 OUTPUT: 834 OUTPUT:
670 RETVAL 835 RETVAL
671 836
672void 837void
673DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
674 CODE: 839 CODE:
675 pango_font_description_free (self); 840 pango_font_description_free (self);
676 841
677void 842void
678make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
679 CODE: 844 CODE:
680 default_font = self; 845 default_font = self;
681 846
682MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
683 848
684CFClient::Layout 849void
685new (SV *class, int base_height = MIN_FONT_HEIGHT) 850reset_glyph_cache ()
851 CODE:
852 tc_clear ();
853
854CFPlus::Layout
855new (SV *class)
686 CODE: 856 CODE:
687 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
858
688 RETVAL->pl = pango_layout_new (context); 859 RETVAL->pl = pango_layout_new (opengl_context);
689 RETVAL->base_height = base_height; 860 RETVAL->r = 1.;
861 RETVAL->g = 1.;
862 RETVAL->b = 1.;
863 RETVAL->a = 1.;
864 RETVAL->base_height = MIN_FONT_HEIGHT;
690 RETVAL->font = 0; 865 RETVAL->font = 0;
866
691 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 867 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
692 pango_layout_set_font_description (RETVAL->pl, default_font); 868 layout_update_font (RETVAL);
693 OUTPUT: 869 OUTPUT:
694 RETVAL 870 RETVAL
695 871
696void 872void
697DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
698 CODE: 874 CODE:
699 g_object_unref (self->pl); 875 g_object_unref (self->pl);
700 Safefree (self); 876 Safefree (self);
701 877
702void 878void
703set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
704 CODE: 880 CODE:
705{ 881{
706 STRLEN textlen; 882 STRLEN textlen;
707 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
708 884
709 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
710} 886}
711 887
712void 888void
713set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
714 CODE: 890 CODE:
715{ 891{
716 STRLEN textlen; 892 STRLEN textlen;
717 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
718 894
719 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
720} 896}
721 897
898void
899set_shapes (CFPlus::Layout self, ...)
900 CODE:
901{
902 PangoAttrList *attrs = 0;
903 const char *text = pango_layout_get_text (self->pl);
904 const char *pos = text;
905 int arg = 4;
906
907 while (arg < items && (pos = strstr (pos, OBJ_STR)))
908 {
909 PangoRectangle inkrect, rect;
910 PangoAttribute *attr;
911
912 int x = SvIV (ST (arg - 3));
913 int y = SvIV (ST (arg - 2));
914 int w = SvIV (ST (arg - 1));
915 int h = SvIV (ST (arg ));
916
917 inkrect.x = 0;
918 inkrect.y = 0;
919 inkrect.width = 0;
920 inkrect.height = 0;
921
922 rect.x = x * PANGO_SCALE;
923 rect.y = y * PANGO_SCALE;
924 rect.width = w * PANGO_SCALE;
925 rect.height = h * PANGO_SCALE;
926
927 if (!attrs)
928 attrs = pango_layout_get_attributes (self->pl);
929
930 attr = pango_attr_shape_new (&inkrect, &rect);
931 attr->start_index = pos - text;
932 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
933 pango_attr_list_insert (attrs, attr);
934
935 arg += 4;
936 pos += sizeof (OBJ_STR) - 1;
937 }
938
939 if (attrs)
940 pango_layout_set_attributes (self->pl, attrs);
941}
942
943void
944get_shapes (CFPlus::Layout self)
945 PPCODE:
946{
947 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
948
949 do
950 {
951 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
952
953 if (run && shape_attr_p (run))
954 {
955 PangoRectangle extents;
956 pango_layout_iter_get_run_extents (iter, 0, &extents);
957
958 EXTEND (SP, 2);
959 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
960 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
961 }
962 }
963 while (pango_layout_iter_next_run (iter));
964
965 pango_layout_iter_free (iter);
966}
967
968int
969has_wrapped (CFPlus::Layout self)
970 CODE:
971{
972 int lines = 1;
973 const char *text = pango_layout_get_text (self->pl);
974
975 while (*text)
976 lines += *text++ == '\n';
977
978 RETVAL = lines < pango_layout_get_line_count (self->pl);
979}
980 OUTPUT:
981 RETVAL
982
722SV * 983SV *
723get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
724 CODE: 985 CODE:
725 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
726 SvUTF8_on (RETVAL); 987 sv_utf8_decode (RETVAL);
727 OUTPUT: 988 OUTPUT:
728 RETVAL 989 RETVAL
729 990
730void 991void
992set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
993 CODE:
994 self->r = r;
995 self->g = g;
996 self->b = b;
997 self->a = a;
998
999void
731set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
732 CODE: 1001 CODE:
733 if (self->font != font) 1002 if (self->font != font)
734 { 1003 {
735 self->font = font; 1004 self->font = font;
736 layout_update_font (self); 1005 layout_update_font (self);
737 } 1006 }
738 1007
739void 1008void
740set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
741 CODE: 1010 CODE:
742 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
743 { 1012 {
744 self->base_height = base_height; 1013 self->base_height = base_height;
745 layout_update_font (self); 1014 layout_update_font (self);
746 } 1015 }
747 1016
748void 1017void
749set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
750 CODE: 1019 CODE:
751 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1020 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
752 1021
753void 1022void
1023set_indent (CFPlus::Layout self, int indent)
1024 CODE:
1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1026
1027void
1028set_spacing (CFPlus::Layout self, int spacing)
1029 CODE:
1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1031
1032void
1033set_ellipsise (CFPlus::Layout self, int ellipsise)
1034 CODE:
1035 pango_layout_set_ellipsize (self->pl,
1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1039 : PANGO_ELLIPSIZE_NONE
1040 );
1041
1042void
1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
1044 CODE:
1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1046
1047void
754size (CFClient::Layout self) 1048size (CFPlus::Layout self)
755 PPCODE: 1049 PPCODE:
756{ 1050{
757 int w, h; 1051 int w, h;
758 1052
759 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
762 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
763 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
764} 1058}
765 1059
766int 1060int
1061descent (CFPlus::Layout self)
1062 CODE:
1063{
1064 PangoRectangle rect;
1065 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1066 pango_layout_line_get_pixel_extents (line, 0, &rect);
1067 RETVAL = PANGO_DESCENT (rect);
1068}
1069 OUTPUT:
1070 RETVAL
1071
1072int
767xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
768 CODE: 1074 CODE:
769{ 1075{
770 int index, trailing; 1076 int index, trailing;
771 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1077 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
772 RETVAL = index; 1078 RETVAL = index + trailing;
773} 1079}
774 OUTPUT: 1080 OUTPUT:
775 RETVAL 1081 RETVAL
776 1082
777void 1083void
778cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
779 PPCODE: 1085 PPCODE:
780{ 1086{
781 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
782 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
783 1089
786 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
787 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
788} 1094}
789 1095
790void 1096void
791render (CFClient::Layout self) 1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
792 PPCODE: 1098 PPCODE:
793{ 1099{
794 SV *retval; 1100 int line, x;
795 int w, h;
796 FT_Bitmap bitmap;
797 1101
798 layout_get_pixel_size (self, &w, &h); 1102 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1103 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
799 1104
800 retval = newSV (w * h);
801 SvPOK_only (retval);
802 SvCUR_set (retval, w * h);
803
804 bitmap.rows = h;
805 bitmap.width = w;
806 bitmap.pitch = w;
807 bitmap.buffer = (unsigned char*)SvPVX (retval);
808 bitmap.num_grays = 256;
809 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
810
811 memset (bitmap.buffer, 0, w * h);
812
813 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
814
815 EXTEND (SP, 3); 1105 EXTEND (SP, 2);
816 PUSHs (sv_2mortal (newSViv (w))); 1106 PUSHs (sv_2mortal (newSViv (line - 1)));
1107 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1108}
1109
1110void
1111line_x_to_index (CFPlus::Layout self, int line, int x)
1112 PPCODE:
1113{
1114 PangoLayoutLine *lp;
1115 int index, trailing;
1116
1117 if (line < 0)
1118 XSRETURN_EMPTY;
1119
1120 if (!(lp = pango_layout_get_line (self->pl, line)))
1121 XSRETURN_EMPTY; /* do better */
1122
1123 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1124
1125 EXTEND (SP, 2);
1126 if (GIMME_V == G_SCALAR)
1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
1128 else
1129 {
817 PUSHs (sv_2mortal (newSViv (h))); 1130 PUSHs (sv_2mortal (newSViv (index)));
818 PUSHs (sv_2mortal (retval)); 1131 PUSHs (sv_2mortal (newSViv (trailing)));
1132 }
819} 1133}
820 1134
1135void
1136render (CFPlus::Layout self, float x, float y, int flags = 0)
1137 PPCODE:
1138 pango_opengl_render_layout_subpixel (
1139 self->pl,
1140 x * PANGO_SCALE, y * PANGO_SCALE,
1141 self->r, self->g, self->b, self->a,
1142 flags
1143 );
1144
821MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
822 1146
823void 1147void
1148pad2pot (SV *data_, SV *w_, SV *h_)
1149 CODE:
1150{
1151 int ow = SvIV (w_);
1152 int oh = SvIV (h_);
1153
1154 if (ow && oh)
1155 {
1156 int nw = minpot (ow);
1157 int nh = minpot (oh);
1158
1159 if (nw != ow || nh != oh)
1160 {
1161 if (SvOK (data_))
1162 {
1163 STRLEN datalen;
1164 char *data = SvPVbyte (data_, datalen);
1165 int bpp = datalen / (ow * oh);
1166 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1167
1168 SvPOK_only (result_);
1169 SvCUR_set (result_, nw * nh * bpp);
1170
1171 memset (SvPVX (result_), 0, nw * nh * bpp);
1172 while (oh--)
1173 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1174
1175 sv_setsv (data_, result_);
1176 }
1177
1178 sv_setiv (w_, nw);
1179 sv_setiv (h_, nh);
1180 }
1181 }
1182}
1183
1184void
824draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1185draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
825 PROTOTYPE: $$$;$$ 1186 PROTOTYPE: $$$;$$
1187 ALIAS:
1188 draw_quad_alpha = 1
1189 draw_quad_alpha_premultiplied = 2
826 CODE: 1190 CODE:
827{ 1191{
828 HV *hv = (HV *)SvRV (self); 1192 HV *hv = (HV *)SvRV (self);
829 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1193 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
830 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1194 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
831 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1195 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
832 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
833 1196
834 if (items < 5) 1197 if (items < 5)
835 { 1198 {
836 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1199 w = SvNV (*hv_fetch (hv, "w", 1, 1));
837 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1200 h = SvNV (*hv_fetch (hv, "h", 1, 1));
838 } 1201 }
839 1202
1203 if (ix)
1204 {
1205 glEnable (GL_BLEND);
1206
1207 if (ix == 2)
1208 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1209 else
1210 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1211 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1212
1213 glEnable (GL_ALPHA_TEST);
1214 glAlphaFunc (GL_GREATER, 0.01f);
1215 }
1216
840 glBindTexture (GL_TEXTURE_2D, name); 1217 glBindTexture (GL_TEXTURE_2D, name);
841 if (wrap_mode) { 1218
842 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
843 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
844 }
845 glBegin (GL_QUADS); 1219 glBegin (GL_QUADS);
846 glTexCoord2f (0, 0); glVertex2f (x , y ); 1220 glTexCoord2f (0, 0); glVertex2f (x , y );
847 glTexCoord2f (0, t); glVertex2f (x , y + h); 1221 glTexCoord2f (0, t); glVertex2f (x , y + h);
848 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1222 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
849 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1223 glTexCoord2f (s, 0); glVertex2f (x + w, y );
850 glEnd (); 1224 glEnd ();
851}
852 1225
1226 if (ix)
1227 {
1228 glDisable (GL_ALPHA_TEST);
1229 glDisable (GL_BLEND);
1230 }
1231}
1232
853MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
854 1234
855CFClient::Map 1235CFPlus::Map
856new (SV *class, int map_width, int map_height) 1236new (SV *class)
857 CODE: 1237 CODE:
858 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
859 RETVAL->x = 0; 1239 RETVAL->x = 0;
860 RETVAL->y = 0; 1240 RETVAL->y = 0;
861 RETVAL->w = map_width; 1241 RETVAL->w = 0;
862 RETVAL->h = map_height; 1242 RETVAL->h = 0;
863 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
864 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
865 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
866 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
867 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
870 RETVAL->row = 0; 1250 RETVAL->row = 0;
871 OUTPUT: 1251 OUTPUT:
872 RETVAL 1252 RETVAL
873 1253
874void 1254void
875DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
876 CODE: 1256 CODE:
877{ 1257{
878 map_clear (self); 1258 map_clear (self);
879 Safefree (self->face); 1259 Safefree (self->face);
1260 Safefree (self->tex);
880 Safefree (self); 1261 Safefree (self);
881} 1262}
882 1263
883void 1264void
1265resize (CFPlus::Map self, int map_width, int map_height)
1266 CODE:
1267 self->w = map_width;
1268 self->h = map_height;
1269
1270void
884clear (CFClient::Map self) 1271clear (CFPlus::Map self)
885 CODE: 1272 CODE:
886 map_clear (self); 1273 map_clear (self);
887 1274
888void 1275void
889set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
890 CODE: 1277 CODE:
891{ 1278{
892 while (self->faces <= face) 1279 while (self->faces <= face)
893 { 1280 {
894 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
897 1284
898 self->face [face] = texid; 1285 self->face [face] = texid;
899} 1286}
900 1287
901void 1288void
902set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1289set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
903 CODE: 1290 CODE:
904{ 1291{
905 while (self->texs <= texid) 1292 while (self->texs <= texid)
906 { 1293 {
907 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
919 tex->r = r; 1306 tex->r = r;
920 tex->g = g; 1307 tex->g = g;
921 tex->b = b; 1308 tex->b = b;
922 tex->a = a; 1309 tex->a = a;
923 } 1310 }
1311
1312 // somewhat hackish, but for textures that require it, it really
1313 // improves the look, and most others don't suffer.
1314 glBindTexture (GL_TEXTURE_2D, name);
1315 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1316 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1317 // use uglier nearest interpolation because linear suffers
1318 // from transparent color bleeding and ugly wrapping effects.
1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
924} 1320}
925 1321
926int 1322int
927ox (CFClient::Map self) 1323ox (CFPlus::Map self)
928 ALIAS: 1324 ALIAS:
929 oy = 1 1325 oy = 1
1326 x = 2
1327 y = 3
1328 w = 4
1329 h = 5
930 CODE: 1330 CODE:
931 switch (ix) 1331 switch (ix)
932 { 1332 {
933 case 0: RETVAL = self->ox; break; 1333 case 0: RETVAL = self->ox; break;
934 case 1: RETVAL = self->oy; break; 1334 case 1: RETVAL = self->oy; break;
1335 case 2: RETVAL = self->x; break;
1336 case 3: RETVAL = self->y; break;
1337 case 4: RETVAL = self->w; break;
1338 case 5: RETVAL = self->h; break;
935 } 1339 }
936 OUTPUT: 1340 OUTPUT:
937 RETVAL 1341 RETVAL
938 1342
939void 1343void
940scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
941 CODE: 1345 CODE:
942{ 1346{
943 if (dx > 0) 1347 if (dx > 0)
944 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
945 else if (dx < 0) 1349 else if (dx < 0)
946 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1350 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
947 1351
948 if (dy > 0) 1352 if (dy > 0)
949 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
950 else if (dy < 0) 1354 else if (dy < 0)
951 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1355 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
952 1356
953 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
954 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
955 1359
956 while (self->y < 0) 1360 while (self->y < 0)
961 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
962 } 1366 }
963} 1367}
964 1368
965void 1369void
966map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
967 CODE: 1371 CODE:
968{ 1372{
969 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
970 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
971 mapcell *cell; 1375 mapcell *cell;
972 int x, y, flags; 1376 int x, y, flags;
973 1377
974 while (data < data_end) 1378 while (data < data_end - 1)
975 { 1379 {
976 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
977 1381
978 x = ((flags >> 10) & 63) + self->x; 1382 x = self->x + ((flags >> 10) & 63);
979 y = ((flags >> 4) & 63) + self->y; 1383 y = self->y + ((flags >> 4) & 63);
980 1384
981 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
982 1386
983 if (flags & 15) 1387 if (flags & 15)
984 { 1388 {
985 if (cell->darkness < 0) 1389 if (!cell->darkness)
986 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
987 cell->darkness = 0; 1392 cell->darkness = 256;
988 cell->face [0] = 0;
989 cell->face [1] = 0;
990 cell->face [2] = 0;
991 } 1393 }
992 1394
993 cell->darkness = flags & 8 ? *data++ : 255;
994
995 //TODO: don't trust server data to be in-range(!) 1395 //TODO: don't trust server data to be in-range(!)
1396
1397 if (flags & 8)
1398 {
1399 if (extmap)
1400 {
1401 uint8_t ext, cmd;
1402
1403 do
1404 {
1405 ext = *data++;
1406 cmd = ext & 0x3f;
1407
1408 if (cmd < 4)
1409 cell->darkness = 255 - ext * 64 + 1;
1410 else if (cmd == 5) // health
1411 {
1412 cell->stat_width = 1;
1413 cell->stat_hp = *data++;
1414 }
1415 else if (cmd == 6) // monster width
1416 cell->stat_width = *data++ + 1;
1417 else if (cmd == 0x47) // monster width
1418 {
1419 if (*data == 4)
1420 ; // decode player tag
1421
1422 data += *data + 1;
1423 }
1424 else if (cmd == 8) // cell flags
1425 cell->flags = *data++;
1426 else if (ext & 0x40) // unknown, multibyte => skip
1427 data += *data + 1;
1428 else
1429 data++;
1430 }
1431 while (ext & 0x80);
1432 }
1433 else
1434 cell->darkness = *data++ + 1;
1435 }
996 1436
997 if (flags & 4) 1437 if (flags & 4)
998 { 1438 {
999 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1439 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1000 } 1440 }
1008 { 1448 {
1009 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1449 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1010 } 1450 }
1011 } 1451 }
1012 else 1452 else
1013 cell->darkness = -1; 1453 cell->darkness = 0;
1014 } 1454 }
1015} 1455}
1016 1456
1017SV * 1457SV *
1018mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1019 CODE: 1459 CODE:
1020{ 1460{
1021 int x1, x; 1461 int x1, x;
1022 int y1, y; 1462 int y1, y;
1023 int z; 1463 int z;
1073} 1513}
1074 OUTPUT: 1514 OUTPUT:
1075 RETVAL 1515 RETVAL
1076 1516
1077void 1517void
1078draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1518draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1079 PPCODE: 1519 CODE:
1080{ 1520{
1081 int vx, vy;
1082 int x, y, z; 1521 int x, y, z;
1083 int last_name; 1522 int last_name;
1084 mapface face; 1523 mapface face;
1085 int sw4 = (sw + 3) & ~3;
1086 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1087 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1088
1089 memset (darkness, 255, sw4 * sh);
1090 SvPOK_only (darkness_sv);
1091 SvCUR_set (darkness_sv, sw4 * sh);
1092
1093 vx = self->x + (self->w - sw) / 2 - shift_x;
1094 vy = self->y + (self->h - sh) / 2 - shift_y;
1095
1096 /*
1097 int vx = self->vx = self->w >= sw
1098 ? self->x + (self->w - sw) / 2
1099 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1100
1101 int vy = self->vy = self->h >= sh
1102 ? self->y + (self->h - sh) / 2
1103 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1104 */
1105 1524
1106 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1107 1526
1527 glEnable (GL_BLEND);
1108 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1109 glEnable (GL_BLEND);
1110 glEnable (GL_TEXTURE_2D); 1529 glEnable (GL_TEXTURE_2D);
1111 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1112 1531
1113 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1114 1533
1115 last_name = 0; 1534 last_name = 0;
1116 1535
1536 mx += self->x;
1537 my += self->y;
1538
1117 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1118 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1119 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1120 { 1542 {
1121 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1122 1544
1123 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1124 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1125 { 1547 {
1126 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1127
1128 darkness[y * sw4 + x] = cell->darkness < 0
1129 ? 255 - FOW_DARKNESS
1130 : 255 - cell->darkness;
1131 1549
1132 face = cell->face [z]; 1550 face = cell->face [z];
1133 1551
1134 if (face) 1552 if (face && face < self->texs)
1135 { 1553 {
1136 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1137
1138 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * 32 - tex.w;
1139 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * 32 - tex.h;
1140 1557
1141 if (last_name != tex.name) 1558 if (last_name != tex.name)
1142 { 1559 {
1143 glEnd (); 1560 glEnd ();
1144 last_name = tex.name;
1145 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1146 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1147 } 1563 }
1148 1564
1149 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1150 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1151 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1567 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1152 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1153 } 1569 }
1570
1571 if (cell->flags && z == 2)
1572 {
1573 if (cell->flags & 1)
1574 {
1575 maptex tex = self->tex [1];
1576 int px = (x + 1) * 32 - tex.w + 2;
1577 int py = (y + 1) * 32 - tex.h - 6;
1578
1579 glEnd ();
1580 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581 glBegin (GL_QUADS);
1582
1583 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587 }
1588 }
1154 } 1589 }
1155 } 1590 }
1156 1591
1157 glEnd (); 1592 glEnd ();
1158 1593
1159 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1160 glDisable (GL_BLEND); 1595 glDisable (GL_BLEND);
1596
1597 // top layer: overlays such as the health bar
1598 for (y = 0; y < sh; y++)
1599 if (0 <= y + my && y + my < self->rows)
1600 {
1601 maprow *row = self->row + (y + my);
1602
1603 for (x = 0; x < sw; x++)
1604 if (row->c0 <= x + mx && x + mx < row->c1)
1605 {
1606 mapcell *cell = row->col + (x + mx - row->c0);
1607
1608 int px = x * 32;
1609 int py = y * 32;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * 32;
1614 int thick = sh / 28 + 1 + cell->stat_width;
1615
1616 glColor3ub (0, 0, 0);
1617 glRectf (px + 1, py - thick - 2,
1618 px + width - 1, py);
1619
1620 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1621 glRectf (px + 2,
1622 py - thick - 1,
1623 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1624 }
1625 }
1626 }
1627}
1628
1629void
1630draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1631 CODE:
1632{
1633 static float color[16][3] = {
1634 { 0.00F, 0.00F, 0.00F },
1635 { 1.00F, 1.00F, 1.00F },
1636 { 0.00F, 0.00F, 0.55F },
1637 { 1.00F, 0.00F, 0.00F },
1638
1639 { 1.00F, 0.54F, 0.00F },
1640 { 0.11F, 0.56F, 1.00F },
1641 { 0.93F, 0.46F, 0.00F },
1642 { 0.18F, 0.54F, 0.34F },
1643
1644 { 0.56F, 0.73F, 0.56F },
1645 { 0.80F, 0.80F, 0.80F },
1646 { 0.55F, 0.41F, 0.13F },
1647 { 0.99F, 0.77F, 0.26F },
1648
1649 { 0.74F, 0.65F, 0.41F },
1650
1651 { 0.00F, 1.00F, 1.00F },
1652 { 1.00F, 0.00F, 1.00F },
1653 { 1.00F, 1.00F, 0.00F },
1654 };
1655
1656 int x, y;
1657
1658 glEnable (GL_TEXTURE_2D);
1659 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1660 glEnable (GL_BLEND);
1661 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1662 glBegin (GL_QUADS);
1663
1664 for (y = 0; y < h; y++)
1665 for (x = 0; x < w; x++)
1666 {
1667 unsigned char m = data [x + y * w];
1668
1669 if (m)
1670 {
1671 float *c = color [m & 15];
1672
1673 float tx1 = m & 0x40 ? 0.5 : 0.;
1674 float tx2 = tx1 + 0.5;
1675
1676 glColor4f (c[0], c[1], c[2], 0.75);
1677 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1678 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1679 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1680 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1681 }
1682 }
1683
1684 glEnd ();
1685 glDisable (GL_BLEND);
1686 glDisable (GL_TEXTURE_2D);
1687}
1688
1689void
1690fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1691 PPCODE:
1692{
1693 int x, y;
1694 int sw4 = (sw + 3) & ~3;
1695 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1696 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1697
1698 memset (darkness, 255, sw4 * sh);
1699 SvPOK_only (darkness_sv);
1700 SvCUR_set (darkness_sv, sw4 * sh);
1701
1702 mx += self->x;
1703 my += self->y;
1704
1705 for (y = 0; y < sh; y++)
1706 if (0 <= y + my && y + my < self->rows)
1707 {
1708 maprow *row = self->row + (y + my);
1709
1710 for (x = 0; x < sw; x++)
1711 if (row->c0 <= x + mx && x + mx < row->c1)
1712 {
1713 mapcell *cell = row->col + (x + mx - row->c0);
1714
1715 darkness[y * sw4 + x] = cell->darkness
1716 ? 255 - (cell->darkness - 1)
1717 : 255 - FOW_DARKNESS;
1718 }
1719 }
1161 1720
1162 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1163 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1164 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1165 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1166} 1725}
1167 1726
1168SV * 1727SV *
1169get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1728get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1170 CODE: 1729 CODE:
1171{ 1730{
1172 int x, y, x1, y1; 1731 int x, y, x1, y1;
1173 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1174 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1236} 1795}
1237 OUTPUT: 1796 OUTPUT:
1238 RETVAL 1797 RETVAL
1239 1798
1240void 1799void
1241set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1242 PPCODE: 1801 PPCODE:
1243{ 1802{
1244 int x, y, z; 1803 int x, y, z;
1245 int w, h; 1804 int w, h;
1246 int x1, y1; 1805 int x1, y1;
1278 1837
1279 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1280 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1281 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1282 1841
1283 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1284 { 1843 {
1285 cell->darkness = -1; 1844 cell->darkness = 0;
1286 1845
1287 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1288 { 1847 {
1289 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1290 1849
1295 } 1854 }
1296 } 1855 }
1297 } 1856 }
1298} 1857}
1299 1858
1300MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1301 1860
1302CFClient::MixChunk 1861CFPlus::MixChunk
1303new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1304 CODE: 1863 CODE:
1305 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1306 OUTPUT: 1865 OUTPUT:
1307 RETVAL 1866 RETVAL
1308 1867
1309void 1868void
1310DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1311 CODE: 1870 CODE:
1312 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1313 1872
1314int 1873int
1315volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1316 CODE: 1875 CODE:
1317 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1318 OUTPUT: 1877 OUTPUT:
1319 RETVAL 1878 RETVAL
1320 1879
1321int 1880int
1322play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1881play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1323 CODE: 1882 CODE:
1324 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1325 OUTPUT: 1884 OUTPUT:
1326 RETVAL 1885 RETVAL
1327 1886
1328MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1329 1888
1330int 1889int
1331volume (int volume = -1) 1890volume (int volume = -1)
1332 CODE: 1891 CODE:
1333 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1334 OUTPUT: 1893 OUTPUT:
1335 RETVAL 1894 RETVAL
1336 1895
1337CFClient::MixMusic 1896CFPlus::MixMusic
1338new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1339 CODE: 1898 CODE:
1340 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1341 OUTPUT: 1900 OUTPUT:
1342 RETVAL 1901 RETVAL
1343 1902
1344void 1903void
1345DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1346 CODE: 1905 CODE:
1347 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1348 1907
1349int 1908int
1350play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1351 CODE: 1910 CODE:
1352 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1353 OUTPUT: 1912 OUTPUT:
1354 RETVAL 1913 RETVAL
1355 1914
1356MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1357 1916
1358BOOT: 1917BOOT:
1359{ 1918{
1360 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1361 static const struct { 1920 static const struct {
1362 const char *name; 1921 const char *name;
1363 IV iv; 1922 IV iv;
1364 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1365# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
1366 const_iv (GL_COLOR_MATERIAL), 1925 const_iv (GL_COLOR_MATERIAL),
1367 const_iv (GL_SMOOTH), 1926 const_iv (GL_SMOOTH),
1368 const_iv (GL_FLAT), 1927 const_iv (GL_FLAT),
1369 const_iv (GL_DITHER), 1928 const_iv (GL_DITHER),
1370 const_iv (GL_BLEND), 1929 const_iv (GL_BLEND),
1930 const_iv (GL_CULL_FACE),
1371 const_iv (GL_SCISSOR_TEST), 1931 const_iv (GL_SCISSOR_TEST),
1932 const_iv (GL_DEPTH_TEST),
1933 const_iv (GL_ALPHA_TEST),
1934 const_iv (GL_NORMALIZE),
1935 const_iv (GL_RESCALE_NORMAL),
1936 const_iv (GL_FRONT),
1937 const_iv (GL_BACK),
1372 const_iv (GL_AND), 1938 const_iv (GL_AND),
1373 const_iv (GL_ONE), 1939 const_iv (GL_ONE),
1374 const_iv (GL_ZERO), 1940 const_iv (GL_ZERO),
1375 const_iv (GL_SRC_ALPHA), 1941 const_iv (GL_SRC_ALPHA),
1376 const_iv (GL_SRC_ALPHA_SATURATE), 1942 const_iv (GL_DST_ALPHA),
1377 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1943 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1378 const_iv (GL_ONE_MINUS_DST_ALPHA), 1944 const_iv (GL_ONE_MINUS_DST_ALPHA),
1945 const_iv (GL_SRC_ALPHA_SATURATE),
1379 const_iv (GL_RGB), 1946 const_iv (GL_RGB),
1380 const_iv (GL_RGBA), 1947 const_iv (GL_RGBA),
1948 const_iv (GL_RGBA4),
1949 const_iv (GL_RGBA8),
1950 const_iv (GL_RGB5_A1),
1381 const_iv (GL_UNSIGNED_BYTE), 1951 const_iv (GL_UNSIGNED_BYTE),
1952 const_iv (GL_UNSIGNED_SHORT),
1953 const_iv (GL_UNSIGNED_INT),
1382 const_iv (GL_ALPHA), 1954 const_iv (GL_ALPHA),
1955 const_iv (GL_INTENSITY),
1956 const_iv (GL_LUMINANCE),
1957 const_iv (GL_LUMINANCE_ALPHA),
1383 const_iv (GL_FLOAT), 1958 const_iv (GL_FLOAT),
1384 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1959 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1385 const_iv (GL_COMPILE), 1960 const_iv (GL_COMPILE),
1386 const_iv (GL_TEXTURE_1D), 1961 const_iv (GL_TEXTURE_1D),
1387 const_iv (GL_TEXTURE_2D), 1962 const_iv (GL_TEXTURE_2D),
1389 const_iv (GL_TEXTURE_MAG_FILTER), 1964 const_iv (GL_TEXTURE_MAG_FILTER),
1390 const_iv (GL_TEXTURE_MIN_FILTER), 1965 const_iv (GL_TEXTURE_MIN_FILTER),
1391 const_iv (GL_TEXTURE_ENV_MODE), 1966 const_iv (GL_TEXTURE_ENV_MODE),
1392 const_iv (GL_TEXTURE_WRAP_S), 1967 const_iv (GL_TEXTURE_WRAP_S),
1393 const_iv (GL_TEXTURE_WRAP_T), 1968 const_iv (GL_TEXTURE_WRAP_T),
1969 const_iv (GL_REPEAT),
1394 const_iv (GL_CLAMP), 1970 const_iv (GL_CLAMP),
1395 const_iv (GL_REPEAT), 1971 const_iv (GL_CLAMP_TO_EDGE),
1396 const_iv (GL_NEAREST), 1972 const_iv (GL_NEAREST),
1397 const_iv (GL_LINEAR), 1973 const_iv (GL_LINEAR),
1398 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1974 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1399 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1975 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1400 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1976 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1401 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1977 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1402 const_iv (GL_GENERATE_MIPMAP), 1978 const_iv (GL_GENERATE_MIPMAP),
1403 const_iv (GL_MODULATE), 1979 const_iv (GL_MODULATE),
1404 const_iv (GL_DECAL), 1980 const_iv (GL_DECAL),
1405 const_iv (GL_REPLACE), 1981 const_iv (GL_REPLACE),
1982 const_iv (GL_DEPTH_BUFFER_BIT),
1406 const_iv (GL_COLOR_BUFFER_BIT), 1983 const_iv (GL_COLOR_BUFFER_BIT),
1407 const_iv (GL_PROJECTION), 1984 const_iv (GL_PROJECTION),
1408 const_iv (GL_MODELVIEW), 1985 const_iv (GL_MODELVIEW),
1409 const_iv (GL_COLOR_LOGIC_OP), 1986 const_iv (GL_COLOR_LOGIC_OP),
1410 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1411 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1412 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1413 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1414 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1993 const_iv (GL_LINE_LOOP),
1415 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1416 const_iv (GL_LINE_LOOP), 1995 const_iv (GL_QUAD_STRIP),
1996 const_iv (GL_TRIANGLES),
1997 const_iv (GL_TRIANGLE_STRIP),
1998 const_iv (GL_TRIANGLE_FAN),
1417 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1999 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1418 const_iv (GL_FASTEST), 2000 const_iv (GL_FASTEST),
2001 const_iv (GL_V2F),
2002 const_iv (GL_V3F),
2003 const_iv (GL_T2F_V3F),
2004 const_iv (GL_T2F_N3F_V3F),
1419# undef const_iv 2005# undef const_iv
1420 }; 2006 };
1421 2007
1422 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2008 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1423 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2009 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1424} 2010}
1425 2011
2012char *
2013gl_vendor ()
2014 CODE:
2015 RETVAL = (char *)glGetString (GL_VENDOR);
2016 OUTPUT:
2017 RETVAL
2018
2019char *
2020gl_version ()
2021 CODE:
2022 RETVAL = (char *)glGetString (GL_VERSION);
2023 OUTPUT:
2024 RETVAL
2025
2026char *
2027gl_extensions ()
2028 CODE:
2029 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2030 OUTPUT:
2031 RETVAL
2032
1426int glGetError () 2033int glGetError ()
2034
2035void glFinish ()
1427 2036
1428void glClear (int mask) 2037void glClear (int mask)
1429 2038
1430void glClearColor (float r, float g, float b, float a = 1.0) 2039void glClearColor (float r, float g, float b, float a = 1.0)
1431 PROTOTYPE: @ 2040 PROTOTYPE: @
1438 2047
1439void glHint (int target, int mode) 2048void glHint (int target, int mode)
1440 2049
1441void glBlendFunc (int sfactor, int dfactor) 2050void glBlendFunc (int sfactor, int dfactor)
1442 2051
2052void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2053 CODE:
2054 gl_BlendFuncSeparate (sa, da, saa, daa);
2055
2056void glDepthMask (int flag)
2057
1443void glLogicOp (int opcode) 2058void glLogicOp (int opcode)
1444 2059
1445void glColorMask (int red, int green, int blue, int alpha) 2060void glColorMask (int red, int green, int blue, int alpha)
1446 2061
1447void glMatrixMode (int mode) 2062void glMatrixMode (int mode)
1450 2065
1451void glPopMatrix () 2066void glPopMatrix ()
1452 2067
1453void glLoadIdentity () 2068void glLoadIdentity ()
1454 2069
2070void glDrawBuffer (int buffer)
2071
2072void glReadBuffer (int buffer)
2073
1455# near and far are due to microsofts buggy c compiler 2074# near_ and far_ are due to microsofts buggy "c" compiler
2075void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2076
2077# near_ and far_ are due to microsofts buggy "c" compiler
1456void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2078void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1457 2079
1458void glViewport (int x, int y, int width, int height) 2080void glViewport (int x, int y, int width, int height)
1459 2081
1460void glScissor (int x, int y, int width, int height) 2082void glScissor (int x, int y, int width, int height)
1475 2097
1476void glEnd () 2098void glEnd ()
1477 2099
1478void glColor (float r, float g, float b, float a = 1.0) 2100void glColor (float r, float g, float b, float a = 1.0)
1479 PROTOTYPE: @ 2101 PROTOTYPE: @
2102 ALIAS:
2103 glColor_premultiply = 1
1480 CODE: 2104 CODE:
1481 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 2105 if (ix)
2106 {
2107 r *= a;
2108 g *= a;
2109 b *= a;
2110 }
2111 // microsoft visual "c" rounds instead of truncating...
2112 glColor4f (r, g, b, a);
2113
2114void glInterleavedArrays (int format, int stride, char *data)
2115
2116void glDrawElements (int mode, int count, int type, char *indices)
2117
2118# 1.2 void glDrawRangeElements (int mode, int start, int end
2119
2120void glRasterPos (float x, float y, float z = 0.)
2121 CODE:
2122 glRasterPos3f (0, 0, z);
2123 glBitmap (0, 0, 0, 0, x, y, 0);
1482 2124
1483void glVertex (float x, float y, float z = 0.) 2125void glVertex (float x, float y, float z = 0.)
1484 CODE: 2126 CODE:
1485 glVertex3f (x, y, z); 2127 glVertex3f (x, y, z);
1486 2128
1498 2140
1499void glBindTexture (int target, int name) 2141void glBindTexture (int target, int name)
1500 2142
1501void glConvolutionParameter (int target, int pname, float params) 2143void glConvolutionParameter (int target, int pname, float params)
1502 CODE: 2144 CODE:
1503 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2145 if (gl.ConvolutionParameterf)
2146 gl.ConvolutionParameterf (target, pname, params);
1504 2147
1505void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2148void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1506 CODE: 2149 CODE:
1507 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2150 if (gl.ConvolutionFilter2D)
1508 (target, internalformat, width, height, format, type, data)); 2151 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1509 2152
1510void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2153void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1511 CODE: 2154 CODE:
1512 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2155 if (gl.SeparableFilter2D)
1513 (target, internalformat, width, height, format, type, row, column)); 2156 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1514 2157
1515void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2158void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1516 2159
1517void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2160void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1518 2161
1519void glRasterPos (int x, int y) 2162void glDrawPixels (int width, int height, int format, int type, char *pixels)
1520 CODE:
1521 glRasterPos2i (x, y);
1522 2163
1523void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2164void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1524 2165
1525int glGenTexture () 2166int glGenTexture ()
1526 CODE: 2167 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines