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.55 by root, Thu Apr 20 08:11:56 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
45
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
37 47
38#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
39 49
40#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
42 52
53#define MIN_FONT_HEIGHT 10
54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
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
43typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
45 86
46static PangoContext *context; 87typedef PangoFontDescription *CFPlus__Font;
47static PangoFontMap *fontmap; 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}
48 106
49typedef struct cf_layout { 107typedef struct cf_layout {
50 PangoLayout *pl; 108 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode
51 int base_height; 110 int base_height;
111 CFPlus__Font font;
52} *CFClient__Layout; 112} *CFPlus__Layout;
113
114static CFPlus__Font default_font;
115static PangoContext *opengl_context;
116static PangoFontMap *opengl_fontmap;
53 117
54static void 118static void
55substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
56{ 120{
57 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
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59} 126}
60 127
61static void 128static void
62layout_update (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
63{ 130{
64 /* 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
65 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
66 */ 133 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 134 PangoFontDescription *font = self->font ? self->font : default_font;
68 135
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 136 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 137 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 138
139 pango_layout_set_font_description (self->pl, font);
76} 140}
77 141
78static void 142static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
80{ 144{
81 layout_update (self); 145 PangoRectangle rect;
82 146
147 // get_pixel_* wrongly rounds down
83 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
84 149
85 *w = (*w + 3) & ~3; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
86 if (!*w) *w = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
87 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;
88} 158}
89 159
90typedef uint16_t mapface; 160typedef uint16_t mapface;
91 161
92typedef struct { 162typedef struct {
95 float s, t; 165 float s, t;
96 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
97} maptex; 167} maptex;
98 168
99typedef struct { 169typedef struct {
100 int16_t darkness; 170 uint32_t player;
101 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
102} mapcell; 174} mapcell;
103 175
104typedef struct { 176typedef struct {
105 int32_t c0, c1; 177 int32_t c0, c1;
106 mapcell *col; 178 mapcell *col;
115 int texs; 187 int texs;
116 maptex *tex; 188 maptex *tex;
117 189
118 int32_t rows; 190 int32_t rows;
119 maprow *row; 191 maprow *row;
120} *CFClient__Map; 192} *CFPlus__Map;
121 193
122static char * 194static char *
123prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
124{ 196{
125 char *p; 197 char *p;
143 215
144#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))
145#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))
146 218
147static maprow * 219static maprow *
148map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
149{ 221{
150 if (0 > y) 222 if (0 > y)
151 { 223 {
152 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
153 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
191 263
192 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
193} 265}
194 266
195static mapcell * 267static mapcell *
196map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
197{ 269{
198 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
199} 271}
200 272
201static void 273static void
202map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
203{ 275{
204 int r; 276 int r;
205 277
206 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
207 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
215 self->row = 0; 287 self->row = 0;
216 self->rows = 0; 288 self->rows = 0;
217} 289}
218 290
219static void 291static void
220map_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)
221{ 293{
222 int x, y; 294 int x, y;
223 maprow *row; 295 maprow *row;
296 mapcell *cell;
224 297
225 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
226 if (y >= 0) 299 if (y >= 0)
227 { 300 {
228 if (y >= self->rows) 301 if (y >= self->rows)
234 if (x >= row->c0) 307 if (x >= row->c0)
235 { 308 {
236 if (x >= row->c1) 309 if (x >= row->c1)
237 break; 310 break;
238 311
239 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;
240 } 318 }
241 } 319 }
242} 320}
243 321
322static void
323music_finished (void)
324{
325 SDL_UserEvent ev;
326
327 ev.type = SDL_USEREVENT;
328 ev.code = 0;
329 ev.data1 = 0;
330 ev.data2 = 0;
331
332 SDL_PushEvent ((SDL_Event *)&ev);
333}
334
335static void
336channel_finished (int channel)
337{
338 SDL_UserEvent ev;
339
340 ev.type = SDL_USEREVENT;
341 ev.code = 1;
342 ev.data1 = (void *)(long)channel;
343 ev.data2 = 0;
344
345 SDL_PushEvent ((SDL_Event *)&ev);
346}
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
244MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
245 370
246PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
247 372
248BOOT: 373BOOT:
249{ 374{
250 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
251 static const struct { 376 static const struct {
252 const char *name; 377 const char *name;
253 IV iv; 378 IV iv;
254 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
255# 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
256 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
257 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
258 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
259 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
260 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
269 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
270 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
271 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
272 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
273 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
274 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
275 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
276 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
277 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
278 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
333 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
334 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
335 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
336 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
337 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
338 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
339 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
340 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
341 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
342 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
343 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
344 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
345 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
346 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
347 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
348 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
349 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
350 const_iv (KMOD_CTRL),
351 const_iv (KMOD_SHIFT),
352 const_iv (KMOD_ALT),
353 const_iv (KMOD_META)
354# undef const_iv 488# undef const_iv
355 }; 489 };
356 490
357 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; )
358 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
359 493
360 fontmap = pango_ft2_font_map_new (); 494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
361 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
362 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
363} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
364 503
365int 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
366SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 525SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
367 526
368void 527void
369SDL_Quit () 528SDL_Quit ()
370 529
371void 530void
377 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 536 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 537 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 538 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 539 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
381 540
541 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
542 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
543
382 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 544 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386 548
387 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 549 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550#if SDL_VERSION_ATLEAST(1,2,10)
388 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 551 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
389 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 552 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553#endif
390 554
391 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
392 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393 557
394 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
403 567
404 ++m; 568 ++m;
405 } 569 }
406} 570}
407 571
572char *
573SDL_GetError ()
574
408int 575int
409SDL_SetVideoMode (int w, int h, int fullscreen) 576SDL_SetVideoMode (int w, int h, int fullscreen)
410 CODE: 577 CODE:
411 RETVAL = !!SDL_SetVideoMode ( 578 RETVAL = !!SDL_SetVideoMode (
412 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 579 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
413 ); 580 );
581 if (RETVAL)
582 {
414 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 }
415 OUTPUT: 588 OUTPUT:
416 RETVAL 589 RETVAL
417 590
418void 591void
419SDL_GL_SwapBuffers () 592SDL_GL_SwapBuffers ()
593
594char *
595SDL_GetKeyName (int sym)
420 596
421void 597void
422SDL_PollEvent () 598SDL_PollEvent ()
423 PPCODE: 599 PPCODE:
424{ 600{
426 602
427 while (SDL_PollEvent (&ev)) 603 while (SDL_PollEvent (&ev))
428 { 604 {
429 HV *hv = newHV (); 605 HV *hv = newHV ();
430 hv_store (hv, "type", 4, newSViv (ev.type), 0); 606 hv_store (hv, "type", 4, newSViv (ev.type), 0);
607
431 switch (ev.type) 608 switch (ev.type)
432 { 609 {
433 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
434 case SDL_KEYUP: 611 case SDL_KEYUP:
435 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
436 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
437 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 */
438 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
439 break; 617 break;
440 618
441 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
442 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
443 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 621 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
444 break; 622 break;
445 623
446 case SDL_MOUSEMOTION: 624 case SDL_MOUSEMOTION:
625 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
447 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 627 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
448 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 628 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
449 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 629 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
450 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 630 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
451 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 631 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
452 break; 632 break;
453 633
454 case SDL_MOUSEBUTTONDOWN: 634 case SDL_MOUSEBUTTONDOWN:
455 case SDL_MOUSEBUTTONUP: 635 case SDL_MOUSEBUTTONUP:
636 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
637
456 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 638 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 639 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 640 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 641 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
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;
460 } 649 }
461 650
462 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
463 } 652 }
464} 653}
465 654
466int 655int
467Mix_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)
657 POSTCALL:
658 Mix_HookMusicFinished (music_finished);
659 Mix_ChannelFinished (channel_finished);
468 660
469void 661void
470Mix_CloseAudio () 662Mix_CloseAudio ()
471 663
472int 664int
477 CODE: 669 CODE:
478#ifndef _WIN32 670#ifndef _WIN32
479 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
480#endif 672#endif
481 673
482char * 674void
483gl_version () 675win32_proxy_info ()
484 CODE: 676 PPCODE:
485 RETVAL = (char *)glGetString (GL_VERSION); 677{
486 OUTPUT: 678#ifdef _WIN32
487 RETVAL 679 char buffer[2048];
680 DWORD buflen;
488 681
489char * 682 EXTEND (SP, 3);
490gl_extensions () 683
491 CODE: 684 buflen = sizeof (buffer);
492 RETVAL = (char *)glGetString (GL_EXTENSIONS); 685 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
493 OUTPUT: 686 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
494 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}
495 702
496void 703void
497add_font (char *file) 704add_font (char *file)
498 CODE: 705 CODE:
499 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
500
501void
502set_font (char *file)
503 CODE:
504{
505 int count;
506 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
507 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508 FcPatternDestroy (pattern);
509 pango_context_set_font_description (context, font);
510}
511 707
512void 708void
513load_image_inline (SV *image_) 709load_image_inline (SV *image_)
514 ALIAS: 710 ALIAS:
515 load_image_file = 1 711 load_image_file = 1
557 753
558 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
559 755
560 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
561 757
758 SDL_LockSurface (surface2);
562 EXTEND (SP, 5); 759 EXTEND (SP, 6);
563 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
564 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
565 SDL_LockSurface (surface2);
566 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
567 SDL_UnlockSurface (surface2);
568 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)));
569 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
570 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
571 767
572 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
573 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
574} 770}
575 771
597 PUSHs (sv_2mortal (newSViv (b / y))); 793 PUSHs (sv_2mortal (newSViv (b / y)));
598 PUSHs (sv_2mortal (newSViv (a / y))); 794 PUSHs (sv_2mortal (newSViv (a / y)));
599} 795}
600 796
601void 797void
798error (char *message)
799 CODE:
800 fprintf (stderr, "ERROR: %s\n", message);
801#ifdef _WIN32
802 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
803#endif
804
805void
602fatal (char *message) 806fatal (char *message)
603 CODE: 807 CODE:
808 fprintf (stderr, "FATAL: %s\n", message);
604#ifdef _WIN32 809#ifdef _WIN32
605 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 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
606#else 819#else
607 fprintf (stderr, "FATAL: %s\n", message); 820 _exit (retval);
608#endif 821#endif
609 exit (1);
610 822
823MODULE = CFPlus PACKAGE = CFPlus::Font
824
825CFPlus::Font
826new_from_file (SV *class, char *path, int id = 0)
827 CODE:
828{
829 int count;
830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
831 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
832 FcPatternDestroy (pattern);
833}
834 OUTPUT:
835 RETVAL
836
837void
838DESTROY (CFPlus::Font self)
839 CODE:
840 pango_font_description_free (self);
841
842void
843make_default (CFPlus::Font self)
844 CODE:
845 default_font = self;
846
611MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
612 848
613CFClient::Layout 849void
614new (SV *class, int base_height = 10) 850reset_glyph_cache ()
851 CODE:
852 tc_clear ();
853
854CFPlus::Layout
855new (SV *class)
615 CODE: 856 CODE:
616 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
617 RETVAL->base_height = base_height; 858
618 RETVAL->pl = pango_layout_new (context); 859 RETVAL->pl = pango_layout_new (opengl_context);
860 RETVAL->r = 1.;
861 RETVAL->g = 1.;
862 RETVAL->b = 1.;
863 RETVAL->a = 1.;
864 RETVAL->base_height = MIN_FONT_HEIGHT;
865 RETVAL->font = 0;
866
619 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 867 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
868 layout_update_font (RETVAL);
620 OUTPUT: 869 OUTPUT:
621 RETVAL 870 RETVAL
622 871
623void 872void
624DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
625 CODE: 874 CODE:
626 g_object_unref (self->pl); 875 g_object_unref (self->pl);
627 Safefree (self); 876 Safefree (self);
628 877
629void 878void
630set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
631 CODE: 880 CODE:
632{ 881{
633 STRLEN textlen; 882 STRLEN textlen;
634 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
635 884
636 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
637} 886}
638 887
639void 888void
640set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
641 CODE: 890 CODE:
642{ 891{
643 STRLEN textlen; 892 STRLEN textlen;
644 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
645 894
646 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
647} 896}
648 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
649SV * 983SV *
650get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
651 CODE: 985 CODE:
652 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
653 SvUTF8_on (RETVAL); 987 sv_utf8_decode (RETVAL);
654 OUTPUT: 988 OUTPUT:
655 RETVAL 989 RETVAL
656 990
657void 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
1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
1001 CODE:
1002 if (self->font != font)
1003 {
1004 self->font = font;
1005 layout_update_font (self);
1006 }
1007
1008void
658set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
659 CODE: 1010 CODE:
1011 if (self->base_height != base_height)
1012 {
660 self->base_height = base_height; 1013 self->base_height = base_height;
1014 layout_update_font (self);
1015 }
661 1016
662void 1017void
663set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
664 CODE: 1019 CODE:
665 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);
666 1021
667void 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
668size (CFClient::Layout self) 1048size (CFPlus::Layout self)
669 PPCODE: 1049 PPCODE:
670{ 1050{
671 int w, h; 1051 int w, h;
672 1052
673 layout_update (self);
674 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
675 1054
676 EXTEND (SP, 2); 1055 EXTEND (SP, 2);
677 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
678 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
679} 1058}
680 1059
681int 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
682xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
683 CODE: 1074 CODE:
684{ 1075{
685 int index, trailing; 1076 int index, trailing;
686
687 layout_update (self);
688 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);
689
690 RETVAL = index; 1078 RETVAL = index + trailing;
691} 1079}
692 OUTPUT: 1080 OUTPUT:
693 RETVAL 1081 RETVAL
694 1082
695void 1083void
696cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
697 PPCODE: 1085 PPCODE:
698{ 1086{
699 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
700 layout_update (self);
701 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702 1089
703 EXTEND (SP, 3); 1090 EXTEND (SP, 3);
704 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1091 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
706 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
707} 1094}
708 1095
709void 1096void
710render (CFClient::Layout self) 1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
711 PPCODE: 1098 PPCODE:
712{ 1099{
713 SV *retval; 1100 int line, x;
714 int w, h;
715 FT_Bitmap bitmap;
716 1101
717 layout_update (self); 1102 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
718 layout_get_pixel_size (self, &w, &h); 1103 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
719 1104
720 retval = newSV (w * h);
721 SvPOK_only (retval);
722 SvCUR_set (retval, w * h);
723
724 bitmap.rows = h;
725 bitmap.width = w;
726 bitmap.pitch = w;
727 bitmap.buffer = (unsigned char*)SvPVX (retval);
728 bitmap.num_grays = 256;
729 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730
731 memset (bitmap.buffer, 0, w * h);
732
733 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
734
735 EXTEND (SP, 3); 1105 EXTEND (SP, 2);
736 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 {
737 PUSHs (sv_2mortal (newSViv (h))); 1130 PUSHs (sv_2mortal (newSViv (index)));
738 PUSHs (sv_2mortal (retval)); 1131 PUSHs (sv_2mortal (newSViv (trailing)));
1132 }
739} 1133}
740 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
741MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
742 1146
743void 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
744draw_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.)
745 PROTOTYPE: $$$;$$ 1186 PROTOTYPE: $$$;$$
1187 ALIAS:
1188 draw_quad_alpha = 1
1189 draw_quad_alpha_premultiplied = 2
746 CODE: 1190 CODE:
747{ 1191{
748 HV *hv = (HV *)SvRV (self); 1192 HV *hv = (HV *)SvRV (self);
749 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1193 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1194 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
751 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1195 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
752 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
753 1196
754 if (items < 5) 1197 if (items < 5)
755 { 1198 {
756 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1199 w = SvNV (*hv_fetch (hv, "w", 1, 1));
757 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1200 h = SvNV (*hv_fetch (hv, "h", 1, 1));
758 } 1201 }
759 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
760 glBindTexture (GL_TEXTURE_2D, name); 1217 glBindTexture (GL_TEXTURE_2D, name);
761 if (wrap_mode) { 1218
762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764 }
765 glBegin (GL_QUADS); 1219 glBegin (GL_QUADS);
766 glTexCoord2f (0, 0); glVertex2f (x , y ); 1220 glTexCoord2f (0, 0); glVertex2f (x , y );
767 glTexCoord2f (0, t); glVertex2f (x , y + h); 1221 glTexCoord2f (0, t); glVertex2f (x , y + h);
768 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1222 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1223 glTexCoord2f (s, 0); glVertex2f (x + w, y );
770 glEnd (); 1224 glEnd ();
771}
772 1225
1226 if (ix)
1227 {
1228 glDisable (GL_ALPHA_TEST);
1229 glDisable (GL_BLEND);
1230 }
1231}
1232
773MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
774 1234
775CFClient::Map 1235CFPlus::Map
776new (SV *class, int map_width, int map_height) 1236new (SV *class)
777 CODE: 1237 CODE:
778 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
779 RETVAL->x = 0; 1239 RETVAL->x = 0;
780 RETVAL->y = 0; 1240 RETVAL->y = 0;
781 RETVAL->w = map_width; 1241 RETVAL->w = 0;
782 RETVAL->h = map_height; 1242 RETVAL->h = 0;
783 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
784 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
785 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
786 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
787 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
790 RETVAL->row = 0; 1250 RETVAL->row = 0;
791 OUTPUT: 1251 OUTPUT:
792 RETVAL 1252 RETVAL
793 1253
794void 1254void
795DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
796 CODE: 1256 CODE:
797{ 1257{
798 map_clear (self); 1258 map_clear (self);
799 Safefree (self->face); 1259 Safefree (self->face);
1260 Safefree (self->tex);
800 Safefree (self); 1261 Safefree (self);
801} 1262}
802 1263
803void 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
804clear (CFClient::Map self) 1271clear (CFPlus::Map self)
805 CODE: 1272 CODE:
806 map_clear (self); 1273 map_clear (self);
807 1274
808void 1275void
809set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
810 CODE: 1277 CODE:
811{ 1278{
812 while (self->faces <= face) 1279 while (self->faces <= face)
813 { 1280 {
814 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
817 1284
818 self->face [face] = texid; 1285 self->face [face] = texid;
819} 1286}
820 1287
821void 1288void
822set_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)
823 CODE: 1290 CODE:
824{ 1291{
825 while (self->texs <= texid) 1292 while (self->texs <= texid)
826 { 1293 {
827 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
839 tex->r = r; 1306 tex->r = r;
840 tex->g = g; 1307 tex->g = g;
841 tex->b = b; 1308 tex->b = b;
842 tex->a = a; 1309 tex->a = a;
843 } 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);
844} 1320}
845 1321
846int 1322int
847ox (CFClient::Map self) 1323ox (CFPlus::Map self)
848 ALIAS: 1324 ALIAS:
849 oy = 1 1325 oy = 1
1326 x = 2
1327 y = 3
1328 w = 4
1329 h = 5
850 CODE: 1330 CODE:
851 switch (ix) 1331 switch (ix)
852 { 1332 {
853 case 0: RETVAL = self->ox; break; 1333 case 0: RETVAL = self->ox; break;
854 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;
855 } 1339 }
856 OUTPUT: 1340 OUTPUT:
857 RETVAL 1341 RETVAL
858 1342
859void 1343void
860scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
861 CODE: 1345 CODE:
862{ 1346{
863 if (dx > 0) 1347 if (dx > 0)
864 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
865 else if (dx < 0) 1349 else if (dx < 0)
866 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);
867 1351
868 if (dy > 0) 1352 if (dy > 0)
869 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
870 else if (dy < 0) 1354 else if (dy < 0)
871 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);
872 1356
873 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
874 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
875 1359
876 while (self->y < 0) 1360 while (self->y < 0)
881 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
882 } 1366 }
883} 1367}
884 1368
885void 1369void
886map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
887 CODE: 1371 CODE:
888{ 1372{
889 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
890 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
891 mapcell *cell; 1375 mapcell *cell;
892 int x, y, flags; 1376 int x, y, flags;
893 1377
894 while (data < data_end) 1378 while (data < data_end - 1)
895 { 1379 {
896 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
897 1381
898 x = ((flags >> 10) & 63) + self->x; 1382 x = self->x + ((flags >> 10) & 63);
899 y = ((flags >> 4) & 63) + self->y; 1383 y = self->y + ((flags >> 4) & 63);
900 1384
901 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
902 1386
903 if (flags & 15) 1387 if (flags & 15)
904 { 1388 {
905 if (cell->darkness < 0) 1389 if (!cell->darkness)
906 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
907 cell->darkness = 0; 1392 cell->darkness = 256;
908 cell->face [0] = 0;
909 cell->face [1] = 0;
910 cell->face [2] = 0;
911 } 1393 }
912 1394
913 cell->darkness = flags & 8 ? *data++ : 255;
914
915 //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 }
916 1436
917 if (flags & 4) 1437 if (flags & 4)
918 { 1438 {
919 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;
920 } 1440 }
928 { 1448 {
929 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;
930 } 1450 }
931 } 1451 }
932 else 1452 else
933 cell->darkness = -1; 1453 cell->darkness = 0;
934 } 1454 }
935} 1455}
936 1456
937SV * 1457SV *
938mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
939 CODE: 1459 CODE:
940{ 1460{
941 int x1, x; 1461 int x1, x;
942 int y1, y; 1462 int y1, y;
943 int z; 1463 int z;
993} 1513}
994 OUTPUT: 1514 OUTPUT:
995 RETVAL 1515 RETVAL
996 1516
997void 1517void
998draw (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)
999 PPCODE: 1519 CODE:
1000{ 1520{
1001 int vx, vy;
1002 int x, y, z; 1521 int x, y, z;
1003 int last_name; 1522 int last_name;
1004 mapface face; 1523 mapface face;
1005 int sw4 = (sw + 3) & ~3;
1006 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1007 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1008
1009 memset (darkness, 255, sw4 * sh);
1010 SvPOK_only (darkness_sv);
1011 SvCUR_set (darkness_sv, sw4 * sh);
1012
1013 vx = self->x + (self->w - sw) / 2 - shift_x;
1014 vy = self->y + (self->h - sh) / 2 - shift_y;
1015
1016 /*
1017 int vx = self->vx = self->w >= sw
1018 ? self->x + (self->w - sw) / 2
1019 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1020
1021 int vy = self->vy = self->h >= sh
1022 ? self->y + (self->h - sh) / 2
1023 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1024 */
1025 1524
1026 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1027 1526
1527 glEnable (GL_BLEND);
1028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1029 glEnable (GL_BLEND);
1030 glEnable (GL_TEXTURE_2D); 1529 glEnable (GL_TEXTURE_2D);
1031 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1032 1531
1033 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1034 1533
1035 last_name = 0; 1534 last_name = 0;
1036 1535
1536 mx += self->x;
1537 my += self->y;
1538
1037 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1038 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1039 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1040 { 1542 {
1041 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1042 1544
1043 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1044 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1045 { 1547 {
1046 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1047
1048 darkness[y * sw4 + x] = cell->darkness < 0
1049 ? 255 - FOW_DARKNESS
1050 : 255 - cell->darkness;
1051 1549
1052 face = cell->face [z]; 1550 face = cell->face [z];
1053 1551
1054 if (face) 1552 if (face && face < self->texs)
1055 { 1553 {
1056 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1057
1058 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * 32 - tex.w;
1059 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * 32 - tex.h;
1060 1557
1061 if (last_name != tex.name) 1558 if (last_name != tex.name)
1062 { 1559 {
1063 glEnd (); 1560 glEnd ();
1064 last_name = tex.name;
1065 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1066 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1067 } 1563 }
1068 1564
1069 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1070 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1071 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);
1072 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1073 } 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 }
1074 } 1589 }
1075 } 1590 }
1076 1591
1077 glEnd (); 1592 glEnd ();
1078 1593
1079 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1080 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 }
1081 1720
1082 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1083 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1084 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1085 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1086} 1725}
1087 1726
1088SV * 1727SV *
1089get_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)
1090 CODE: 1729 CODE:
1091{ 1730{
1092 int x, y, x1, y1; 1731 int x, y, x1, y1;
1093 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1094 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1156} 1795}
1157 OUTPUT: 1796 OUTPUT:
1158 RETVAL 1797 RETVAL
1159 1798
1160void 1799void
1161set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1162 PPCODE: 1801 PPCODE:
1163{ 1802{
1164 int x, y, z; 1803 int x, y, z;
1165 int w, h; 1804 int w, h;
1166 int x1, y1; 1805 int x1, y1;
1198 1837
1199 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1200 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1201 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1202 1841
1203 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1204 { 1843 {
1205 cell->darkness = -1; 1844 cell->darkness = 0;
1206 1845
1207 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1208 { 1847 {
1209 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1210 1849
1215 } 1854 }
1216 } 1855 }
1217 } 1856 }
1218} 1857}
1219 1858
1220MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1221 1860
1222CFClient::MixChunk 1861CFPlus::MixChunk
1223new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1224 CODE: 1863 CODE:
1225 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1226 OUTPUT: 1865 OUTPUT:
1227 RETVAL 1866 RETVAL
1228 1867
1229void 1868void
1230DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1231 CODE: 1870 CODE:
1232 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1233 1872
1234int 1873int
1235volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1236 CODE: 1875 CODE:
1237 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1238 OUTPUT: 1877 OUTPUT:
1239 RETVAL 1878 RETVAL
1240 1879
1241int 1880int
1242play (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)
1243 CODE: 1882 CODE:
1244 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1245 OUTPUT: 1884 OUTPUT:
1246 RETVAL 1885 RETVAL
1247 1886
1248MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1249 1888
1250int 1889int
1251volume (int volume = -1) 1890volume (int volume = -1)
1252 CODE: 1891 CODE:
1253 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1254 OUTPUT: 1893 OUTPUT:
1255 RETVAL 1894 RETVAL
1256 1895
1257CFClient::MixMusic 1896CFPlus::MixMusic
1258new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1259 CODE: 1898 CODE:
1260 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1261 OUTPUT: 1900 OUTPUT:
1262 RETVAL 1901 RETVAL
1263 1902
1264void 1903void
1265DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1266 CODE: 1905 CODE:
1267 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1268 1907
1269int 1908int
1270play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1271 CODE: 1910 CODE:
1272 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1273 OUTPUT: 1912 OUTPUT:
1274 RETVAL 1913 RETVAL
1275 1914
1276MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1277 1916
1278BOOT: 1917BOOT:
1279{ 1918{
1280 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1281 static const struct { 1920 static const struct {
1282 const char *name; 1921 const char *name;
1283 IV iv; 1922 IV iv;
1284 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1285# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
1286 const_iv (GL_COLOR_MATERIAL), 1925 const_iv (GL_COLOR_MATERIAL),
1287 const_iv (GL_SMOOTH), 1926 const_iv (GL_SMOOTH),
1288 const_iv (GL_FLAT), 1927 const_iv (GL_FLAT),
1928 const_iv (GL_DITHER),
1289 const_iv (GL_BLEND), 1929 const_iv (GL_BLEND),
1930 const_iv (GL_CULL_FACE),
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),
1290 const_iv (GL_AND), 1938 const_iv (GL_AND),
1939 const_iv (GL_ONE),
1940 const_iv (GL_ZERO),
1291 const_iv (GL_SRC_ALPHA), 1941 const_iv (GL_SRC_ALPHA),
1942 const_iv (GL_DST_ALPHA),
1292 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1943 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1944 const_iv (GL_ONE_MINUS_DST_ALPHA),
1945 const_iv (GL_SRC_ALPHA_SATURATE),
1293 const_iv (GL_RGB), 1946 const_iv (GL_RGB),
1294 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),
1295 const_iv (GL_UNSIGNED_BYTE), 1951 const_iv (GL_UNSIGNED_BYTE),
1296 const_iv (GL_ALPHA4), 1952 const_iv (GL_UNSIGNED_SHORT),
1953 const_iv (GL_UNSIGNED_INT),
1297 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),
1298 const_iv (GL_FLOAT), 1958 const_iv (GL_FLOAT),
1299 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1959 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300 const_iv (GL_COMPILE), 1960 const_iv (GL_COMPILE),
1301 const_iv (GL_TEXTURE_1D), 1961 const_iv (GL_TEXTURE_1D),
1302 const_iv (GL_TEXTURE_2D), 1962 const_iv (GL_TEXTURE_2D),
1304 const_iv (GL_TEXTURE_MAG_FILTER), 1964 const_iv (GL_TEXTURE_MAG_FILTER),
1305 const_iv (GL_TEXTURE_MIN_FILTER), 1965 const_iv (GL_TEXTURE_MIN_FILTER),
1306 const_iv (GL_TEXTURE_ENV_MODE), 1966 const_iv (GL_TEXTURE_ENV_MODE),
1307 const_iv (GL_TEXTURE_WRAP_S), 1967 const_iv (GL_TEXTURE_WRAP_S),
1308 const_iv (GL_TEXTURE_WRAP_T), 1968 const_iv (GL_TEXTURE_WRAP_T),
1969 const_iv (GL_REPEAT),
1309 const_iv (GL_CLAMP), 1970 const_iv (GL_CLAMP),
1310 const_iv (GL_REPEAT), 1971 const_iv (GL_CLAMP_TO_EDGE),
1311 const_iv (GL_NEAREST), 1972 const_iv (GL_NEAREST),
1312 const_iv (GL_LINEAR), 1973 const_iv (GL_LINEAR),
1974 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1975 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1976 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1977 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1978 const_iv (GL_GENERATE_MIPMAP),
1313 const_iv (GL_MODULATE), 1979 const_iv (GL_MODULATE),
1980 const_iv (GL_DECAL),
1314 const_iv (GL_REPLACE), 1981 const_iv (GL_REPLACE),
1982 const_iv (GL_DEPTH_BUFFER_BIT),
1315 const_iv (GL_COLOR_BUFFER_BIT), 1983 const_iv (GL_COLOR_BUFFER_BIT),
1316 const_iv (GL_PROJECTION), 1984 const_iv (GL_PROJECTION),
1317 const_iv (GL_MODELVIEW), 1985 const_iv (GL_MODELVIEW),
1318 const_iv (GL_COLOR_LOGIC_OP), 1986 const_iv (GL_COLOR_LOGIC_OP),
1987 const_iv (GL_SEPARABLE_2D),
1319 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1320 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1321 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1322 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1993 const_iv (GL_LINE_LOOP),
1323 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1324 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),
1325 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1999 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1326 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),
1327# undef const_iv 2005# undef const_iv
1328 }; 2006 };
1329 2007
1330 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; )
1331 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2009 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1332} 2010}
1333 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
1334int glGetError () 2033int glGetError ()
2034
2035void glFinish ()
1335 2036
1336void glClear (int mask) 2037void glClear (int mask)
1337 2038
1338void glClearColor (float r, float g, float b, float a = 1.0) 2039void glClearColor (float r, float g, float b, float a = 1.0)
1339 PROTOTYPE: @ 2040 PROTOTYPE: @
1346 2047
1347void glHint (int target, int mode) 2048void glHint (int target, int mode)
1348 2049
1349void glBlendFunc (int sfactor, int dfactor) 2050void glBlendFunc (int sfactor, int dfactor)
1350 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
1351void glLogicOp (int opcode) 2058void glLogicOp (int opcode)
1352 2059
2060void glColorMask (int red, int green, int blue, int alpha)
2061
1353void glMatrixMode (int mode) 2062void glMatrixMode (int mode)
1354 2063
1355void glPushMatrix () 2064void glPushMatrix ()
1356 2065
1357void glPopMatrix () 2066void glPopMatrix ()
1358 2067
1359void glLoadIdentity () 2068void glLoadIdentity ()
1360 2069
2070void glDrawBuffer (int buffer)
2071
2072void glReadBuffer (int buffer)
2073
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
1361void 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_)
1362 2079
1363void glViewport (int x, int y, int width, int height) 2080void glViewport (int x, int y, int width, int height)
2081
2082void glScissor (int x, int y, int width, int height)
1364 2083
1365void glTranslate (float x, float y, float z = 0.) 2084void glTranslate (float x, float y, float z = 0.)
1366 CODE: 2085 CODE:
1367 glTranslatef (x, y, z); 2086 glTranslatef (x, y, z);
1368 2087
1369void glScale (float x, float y, float z) 2088void glScale (float x, float y, float z = 1.)
1370 CODE: 2089 CODE:
1371 glScalef (x, y, z); 2090 glScalef (x, y, z);
1372 2091
1373void glRotate (float angle, float x, float y, float z) 2092void glRotate (float angle, float x, float y, float z)
1374 CODE: 2093 CODE:
1378 2097
1379void glEnd () 2098void glEnd ()
1380 2099
1381void glColor (float r, float g, float b, float a = 1.0) 2100void glColor (float r, float g, float b, float a = 1.0)
1382 PROTOTYPE: @ 2101 PROTOTYPE: @
2102 ALIAS:
2103 glColor_premultiply = 1
1383 CODE: 2104 CODE:
2105 if (ix)
2106 {
2107 r *= a;
2108 g *= a;
2109 b *= a;
2110 }
2111 // microsoft visual "c" rounds instead of truncating...
1384 glColor4f (r, g, b, a); 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);
1385 2124
1386void glVertex (float x, float y, float z = 0.) 2125void glVertex (float x, float y, float z = 0.)
1387 CODE: 2126 CODE:
1388 glVertex3f (x, y, z); 2127 glVertex3f (x, y, z);
1389 2128
1401 2140
1402void glBindTexture (int target, int name) 2141void glBindTexture (int target, int name)
1403 2142
1404void glConvolutionParameter (int target, int pname, float params) 2143void glConvolutionParameter (int target, int pname, float params)
1405 CODE: 2144 CODE:
2145 if (gl.ConvolutionParameterf)
1406 glConvolutionParameterf (target, pname, params); 2146 gl.ConvolutionParameterf (target, pname, params);
1407 2147
1408void 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)
2149 CODE:
2150 if (gl.ConvolutionFilter2D)
2151 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2152
2153void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2154 CODE:
2155 if (gl.SeparableFilter2D)
2156 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1409 2157
1410void 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)
1411 2159
1412void 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)
2161
2162void glDrawPixels (int width, int height, int format, int type, char *pixels)
2163
2164void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1413 2165
1414int glGenTexture () 2166int glGenTexture ()
1415 CODE: 2167 CODE:
1416{ 2168{
1417 GLuint name; 2169 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines