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.101 by root, Sat Jun 3 21:57:23 2006 UTC vs.
Revision 1.171 by root, Sun Apr 1 01:19:18 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
15 24
16#include <SDL.h> 25#include <SDL.h>
17#include <SDL_endian.h> 26#include <SDL_endian.h>
18#include <SDL_image.h> 27#include <SDL_image.h>
19#include <SDL_mixer.h> 28#include <SDL_mixer.h>
20#include <SDL_opengl.h> 29#include <SDL_opengl.h>
21 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
22#include <glib/gmacros.h> 34#include <glib/gmacros.h>
23 35
24#include <pango/pango.h> 36#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 37
29#ifndef _WIN32 38#ifndef _WIN32
30# include <sys/types.h> 39# include <sys/types.h>
31# include <sys/socket.h> 40# include <sys/socket.h>
32# include <netinet/in.h> 41# include <netinet/in.h>
33# include <netinet/tcp.h> 42# include <netinet/tcp.h>
34# include <inttypes.h> 43# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 44#endif
43 45
44#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 47
46#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
47 49
48#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
50 52
51#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
52 54
53#define GL_CALL(type,func,args) \ 55#if 0
54 { \ 56# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 57#else
56 static type fptr_; \ 58# define PARACHUTE 0
57 \ 59#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 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
68typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
70 86
71typedef 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}
72 106
73typedef struct cf_layout { 107typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
77 int base_height; 110 int base_height;
78 CFClient__Font font; 111 CFPlus__Font font;
79} *CFClient__Layout; 112} *CFPlus__Layout;
80 113
81static CFClient__Font default_font; 114static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
84 117
85static void 118static void
86substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
87{ 120{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 122#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 124#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 126}
95 127
96static void 128static void
97layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
98{ 130{
99 /* 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
100 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
101 */ 133 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
106 138
107 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
108} 140}
109 141
110static void 142static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
114 149
115 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 152
118 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
119} 158}
120 159
121typedef uint16_t mapface; 160typedef uint16_t mapface;
122 161
123typedef struct { 162typedef struct {
126 float s, t; 165 float s, t;
127 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
128} maptex; 167} maptex;
129 168
130typedef struct { 169typedef struct {
131 int16_t darkness; 170 uint32_t player;
132 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
133} mapcell; 174} mapcell;
134 175
135typedef struct { 176typedef struct {
136 int32_t c0, c1; 177 int32_t c0, c1;
137 mapcell *col; 178 mapcell *col;
146 int texs; 187 int texs;
147 maptex *tex; 188 maptex *tex;
148 189
149 int32_t rows; 190 int32_t rows;
150 maprow *row; 191 maprow *row;
151} *CFClient__Map; 192} *CFPlus__Map;
152 193
153static char * 194static char *
154prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
155{ 196{
156 char *p; 197 char *p;
174 215
175#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))
176#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))
177 218
178static maprow * 219static maprow *
179map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
180{ 221{
181 if (0 > y) 222 if (0 > y)
182 { 223 {
183 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
222 263
223 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
224} 265}
225 266
226static mapcell * 267static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
228{ 269{
229 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
230} 271}
231 272
232static void 273static void
233map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
234{ 275{
235 int r; 276 int r;
236 277
237 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
246 self->row = 0; 287 self->row = 0;
247 self->rows = 0; 288 self->rows = 0;
248} 289}
249 290
250static void 291static void
251map_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)
252{ 293{
253 int x, y; 294 int x, y;
254 maprow *row; 295 maprow *row;
296 mapcell *cell;
255 297
256 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 299 if (y >= 0)
258 { 300 {
259 if (y >= self->rows) 301 if (y >= self->rows)
265 if (x >= row->c0) 307 if (x >= row->c0)
266 { 308 {
267 if (x >= row->c1) 309 if (x >= row->c1)
268 break; 310 break;
269 311
270 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;
271 } 318 }
272 } 319 }
273} 320}
274 321
275static void 322static void
296 ev.data2 = 0; 343 ev.data2 = 0;
297 344
298 SDL_PushEvent ((SDL_Event *)&ev); 345 SDL_PushEvent ((SDL_Event *)&ev);
299} 346}
300 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
301MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
302 370
303PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
304 372
305BOOT: 373BOOT:
306{ 374{
307 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 376 static const struct {
309 const char *name; 377 const char *name;
310 IV iv; 378 IV iv;
311 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
312# 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
313 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
330 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
331 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
395 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
407 const_iv (KMOD_CTRL),
408 const_iv (KMOD_SHIFT),
409 const_iv (KMOD_ALT),
410 const_iv (KMOD_META)
411# undef const_iv 488# undef const_iv
412 }; 489 };
413 490
414 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; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
493
494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
503
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)
417 514
418void 515void
419pango_init () 516pango_init ()
420 CODE: 517 CODE:
421{ 518{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 519 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 520 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 521 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 522}
430 523
431int 524int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 525SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 526
434void 527void
435SDL_Quit () 528SDL_Quit ()
436 529
437void 530void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 537 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 538 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 539 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 540
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 541 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 542 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 543
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 544 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 548
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 549 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550#if SDL_VERSION_ATLEAST(1,2,10)
551 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553#endif
457 554
458 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 557
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 576SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 577 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 578 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 579 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 580 );
581 if (RETVAL)
582 {
484 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 }
485 OUTPUT: 588 OUTPUT:
486 RETVAL 589 RETVAL
487 590
488void 591void
489SDL_GL_SwapBuffers () 592SDL_GL_SwapBuffers ()
507 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
508 case SDL_KEYUP: 611 case SDL_KEYUP:
509 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
510 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
511 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 */
512 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
513 break; 617 break;
514 618
515 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break; 648 break;
545 } 649 }
546 650
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548 } 652 }
549} 653}
550 654
551int 655int
552Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 656Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
566#ifndef _WIN32 670#ifndef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568#endif 672#endif
569 673
570void 674void
675win32_proxy_info ()
676 PPCODE:
677{
678#ifdef _WIN32
679 char buffer[2048];
680 DWORD buflen;
681
682 EXTEND (SP, 3);
683
684 buflen = sizeof (buffer);
685 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
686 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
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}
702
703void
571add_font (char *file) 704add_font (char *file)
572 CODE: 705 CODE:
573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574#ifdef _WIN32
575 // cairo... sigh... requires win2000
576 AddFontResourceEx (file, FR_PRIVATE, 0);
577#endif
578 707
579void 708void
580load_image_inline (SV *image_) 709load_image_inline (SV *image_)
581 ALIAS: 710 ALIAS:
582 load_image_file = 1 711 load_image_file = 1
624 753
625 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626 755
627 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
628 757
758 SDL_LockSurface (surface2);
629 EXTEND (SP, 5); 759 EXTEND (SP, 6);
630 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
631 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
632 SDL_LockSurface (surface2);
633 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634 SDL_UnlockSurface (surface2);
635 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)));
636 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
638 767
639 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
640 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
641} 770}
642 771
678 CODE: 807 CODE:
679 fprintf (stderr, "FATAL: %s\n", message); 808 fprintf (stderr, "FATAL: %s\n", message);
680#ifdef _WIN32 809#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682#endif 811#endif
683 exit (1); 812 _exit (1);
684 813
814void
815_exit (int retval = 0)
816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
820 _exit (retval);
821#endif
822
685MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
686 824
687CFClient::Font 825CFPlus::Font
688new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
689 CODE: 827 CODE:
690{ 828{
691 int count; 829 int count;
692 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
695} 833}
696 OUTPUT: 834 OUTPUT:
697 RETVAL 835 RETVAL
698 836
699void 837void
700DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
701 CODE: 839 CODE:
702 pango_font_description_free (self); 840 pango_font_description_free (self);
703 841
704void 842void
705make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
706 CODE: 844 CODE:
707 default_font = self; 845 default_font = self;
708 846
709MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
710 848
711CFClient::Layout 849void
712new (SV *class, int rgba = 0) 850reset_glyph_cache ()
713 CODE: 851 CODE:
714#if _WIN32 852 tc_clear ();
715 //rgba = 0;//D make stext nicer, breaks TextView 853
716#endif 854CFPlus::Layout
855new (SV *class)
856 CODE:
717 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
718 858
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 859 RETVAL->pl = pango_layout_new (opengl_context);
720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 860 RETVAL->r = 1.;
722 RETVAL->g = 1.; 861 RETVAL->g = 1.;
723 RETVAL->b = 1.; 862 RETVAL->b = 1.;
724 RETVAL->a = 1.; 863 RETVAL->a = 1.;
725 RETVAL->base_height = MIN_FONT_HEIGHT; 864 RETVAL->base_height = MIN_FONT_HEIGHT;
729 layout_update_font (RETVAL); 868 layout_update_font (RETVAL);
730 OUTPUT: 869 OUTPUT:
731 RETVAL 870 RETVAL
732 871
733void 872void
734DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
735 CODE: 874 CODE:
736 g_object_unref (self->pl); 875 g_object_unref (self->pl);
737 Safefree (self); 876 Safefree (self);
738 877
739int
740is_rgba (CFClient::Layout self)
741 CODE:
742 RETVAL = self->rgba;
743 OUTPUT:
744 RETVAL
745
746void 878void
747set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
748 CODE: 880 CODE:
749{ 881{
750 STRLEN textlen; 882 STRLEN textlen;
751 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
752 884
753 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
754} 886}
755 887
756void 888void
757set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
758 CODE: 890 CODE:
759{ 891{
760 STRLEN textlen; 892 STRLEN textlen;
761 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
762 894
763 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
764} 896}
765 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
766SV * 983SV *
767get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
768 CODE: 985 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 987 sv_utf8_decode (RETVAL);
771 OUTPUT: 988 OUTPUT:
772 RETVAL 989 RETVAL
773 990
774void 991void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 992set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776 CODE: 993 CODE:
777 self->r = r; 994 self->r = r;
778 self->g = g; 995 self->g = g;
779 self->b = b; 996 self->b = b;
780 self->a = a; 997 self->a = a;
781 998
782void 999void
783set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784 CODE: 1001 CODE:
785 if (self->font != font) 1002 if (self->font != font)
786 { 1003 {
787 self->font = font; 1004 self->font = font;
788 layout_update_font (self); 1005 layout_update_font (self);
789 } 1006 }
790 1007
791void 1008void
792set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
793 CODE: 1010 CODE:
794 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
795 { 1012 {
796 self->base_height = base_height; 1013 self->base_height = base_height;
797 layout_update_font (self); 1014 layout_update_font (self);
798 } 1015 }
799 1016
800void 1017void
801set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
802 CODE: 1019 CODE:
803 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);
804 1021
805void 1022void
806set_indent (CFClient::Layout self, int indent) 1023set_indent (CFPlus::Layout self, int indent)
807 CODE: 1024 CODE:
808 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809 1026
810void 1027void
811set_spacing (CFClient::Layout self, int spacing) 1028set_spacing (CFPlus::Layout self, int spacing)
812 CODE: 1029 CODE:
813 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814 1031
815void 1032void
816set_ellipsise (CFClient::Layout self, int ellipsise) 1033set_ellipsise (CFPlus::Layout self, int ellipsise)
817 CODE: 1034 CODE:
818 pango_layout_set_ellipsize (self->pl, 1035 pango_layout_set_ellipsize (self->pl,
819 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
820 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
822 : PANGO_ELLIPSIZE_NONE 1039 : PANGO_ELLIPSIZE_NONE
823 ); 1040 );
824 1041
825void 1042void
826set_single_paragraph_mode (CFClient::Layout self, int spm) 1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
827 CODE: 1044 CODE:
828 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829 1046
830void 1047void
831size (CFClient::Layout self) 1048size (CFPlus::Layout self)
832 PPCODE: 1049 PPCODE:
833{ 1050{
834 int w, h; 1051 int w, h;
835 1052
836 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
839 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
840 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
841} 1058}
842 1059
843int 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
844xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
845 CODE: 1074 CODE:
846{ 1075{
847 int index, trailing; 1076 int index, trailing;
848 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);
849 RETVAL = index; 1078 RETVAL = index + trailing;
850} 1079}
851 OUTPUT: 1080 OUTPUT:
852 RETVAL 1081 RETVAL
853 1082
854void 1083void
855cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
856 PPCODE: 1085 PPCODE:
857{ 1086{
858 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
859 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860 1089
863 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865} 1094}
866 1095
867void 1096void
868render (CFClient::Layout self) 1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
869 PPCODE: 1098 PPCODE:
870{ 1099{
871 SV *retval; 1100 int line, x;
872 int w, h;
873 1101
874 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 */
875 1104
876 if (self->rgba)
877 {
878 cairo_surface_t *surface;
879 cairo_t *cairo;
880
881 retval = newSV (w * h * 4);
882 SvPOK_only (retval);
883 SvCUR_set (retval, w * h * 4);
884
885 memset (SvPVX (retval), 0, w * h * 4);
886
887 surface = cairo_image_surface_create_for_data (
888 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
889 cairo = cairo_create (surface);
890 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892 pango_cairo_show_layout (cairo, self->pl);
893
894 cairo_destroy (cairo);
895 cairo_surface_destroy (surface);
896
897 // what a mess, and its premultiplied, too :(
898 {
899 uint32_t *p = (uint32_t *)SvPVX (retval);
900 uint32_t *e = p + w * h;
901
902 while (p < e)
903 {
904 uint32_t rgba = *p;
905 rgba = (rgba >> 24) | (rgba << 8);
906#if 0
907#ifdef _WIN32
908 {//D
909 uint8_t r = rgba >> 24;
910 uint8_t g = rgba >> 16;
911 uint8_t b = rgba >> 8;
912 uint8_t a = rgba >> 0;
913
914 rgba = (rgba & 0xffffff00) | a;
915 }
916#endif
917#endif
918 rgba = SDL_SwapBE32 (rgba);
919 *p++ = rgba;
920 }
921 }
922
923 EXTEND (SP, 5); 1105 EXTEND (SP, 2);
924 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)
925 PUSHs (sv_2mortal (newSViv (h))); 1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
926 PUSHs (sv_2mortal (retval));
927 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929 }
930 else 1128 else
931 { 1129 {
932 FT_Bitmap bitmap;
933
934 retval = newSV (w * h);
935 SvPOK_only (retval);
936 SvCUR_set (retval, w * h);
937
938 bitmap.rows = h;
939 bitmap.width = w;
940 bitmap.pitch = w;
941 bitmap.buffer = (unsigned char*)SvPVX (retval);
942 bitmap.num_grays = 256;
943 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945 memset (bitmap.buffer, 0, w * h);
946
947 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949 EXTEND (SP, 5);
950 PUSHs (sv_2mortal (newSViv (w))); 1130 PUSHs (sv_2mortal (newSViv (index)));
951 PUSHs (sv_2mortal (newSViv (h))); 1131 PUSHs (sv_2mortal (newSViv (trailing)));
952 PUSHs (sv_2mortal (retval));
953 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955 } 1132 }
956} 1133}
957 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
958MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
959 1146
960void 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
961draw_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.)
962 PROTOTYPE: $$$;$$ 1186 PROTOTYPE: $$$;$$
963 ALIAS: 1187 ALIAS:
964 draw_quad_alpha = 1 1188 draw_quad_alpha = 1
965 draw_quad_alpha_premultiplied = 2 1189 draw_quad_alpha_premultiplied = 2
966 CODE: 1190 CODE:
977 } 1201 }
978 1202
979 if (ix) 1203 if (ix)
980 { 1204 {
981 glEnable (GL_BLEND); 1205 glEnable (GL_BLEND);
1206
1207 if (ix == 2)
982 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 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
983 glEnable (GL_ALPHA_TEST); 1213 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1214 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1215 }
986 1216
987 glBindTexture (GL_TEXTURE_2D, name); 1217 glBindTexture (GL_TEXTURE_2D, name);
998 glDisable (GL_ALPHA_TEST); 1228 glDisable (GL_ALPHA_TEST);
999 glDisable (GL_BLEND); 1229 glDisable (GL_BLEND);
1000 } 1230 }
1001} 1231}
1002 1232
1003MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1004 1234
1005CFClient::Map 1235CFPlus::Map
1006new (SV *class, int map_width, int map_height) 1236new (SV *class)
1007 CODE: 1237 CODE:
1008 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1009 RETVAL->x = 0; 1239 RETVAL->x = 0;
1010 RETVAL->y = 0; 1240 RETVAL->y = 0;
1011 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1012 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1013 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1014 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1015 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1016 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1017 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
1020 RETVAL->row = 0; 1250 RETVAL->row = 0;
1021 OUTPUT: 1251 OUTPUT:
1022 RETVAL 1252 RETVAL
1023 1253
1024void 1254void
1025DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
1026 CODE: 1256 CODE:
1027{ 1257{
1028 map_clear (self); 1258 map_clear (self);
1029 Safefree (self->face); 1259 Safefree (self->face);
1260 Safefree (self->tex);
1030 Safefree (self); 1261 Safefree (self);
1031} 1262}
1032 1263
1033void 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
1034clear (CFClient::Map self) 1271clear (CFPlus::Map self)
1035 CODE: 1272 CODE:
1036 map_clear (self); 1273 map_clear (self);
1037 1274
1038void 1275void
1039set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
1040 CODE: 1277 CODE:
1041{ 1278{
1042 while (self->faces <= face) 1279 while (self->faces <= face)
1043 { 1280 {
1044 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
1047 1284
1048 self->face [face] = texid; 1285 self->face [face] = texid;
1049} 1286}
1050 1287
1051void 1288void
1052set_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)
1053 CODE: 1290 CODE:
1054{ 1291{
1055 while (self->texs <= texid) 1292 while (self->texs <= texid)
1056 { 1293 {
1057 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
1081 // from transparent color bleeding and ugly wrapping effects. 1318 // from transparent color bleeding and ugly wrapping effects.
1082 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1083} 1320}
1084 1321
1085int 1322int
1086ox (CFClient::Map self) 1323ox (CFPlus::Map self)
1087 ALIAS: 1324 ALIAS:
1088 oy = 1 1325 oy = 1
1089 x = 2 1326 x = 2
1090 y = 3 1327 y = 3
1328 w = 4
1329 h = 5
1091 CODE: 1330 CODE:
1092 switch (ix) 1331 switch (ix)
1093 { 1332 {
1094 case 0: RETVAL = self->ox; break; 1333 case 0: RETVAL = self->ox; break;
1095 case 1: RETVAL = self->oy; break; 1334 case 1: RETVAL = self->oy; break;
1096 case 2: RETVAL = self->x; break; 1335 case 2: RETVAL = self->x; break;
1097 case 3: RETVAL = self->y; break; 1336 case 3: RETVAL = self->y; break;
1337 case 4: RETVAL = self->w; break;
1338 case 5: RETVAL = self->h; break;
1098 } 1339 }
1099 OUTPUT: 1340 OUTPUT:
1100 RETVAL 1341 RETVAL
1101 1342
1102void 1343void
1103scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1104 CODE: 1345 CODE:
1105{ 1346{
1106 if (dx > 0) 1347 if (dx > 0)
1107 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1108 else if (dx < 0) 1349 else if (dx < 0)
1109 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);
1110 1351
1111 if (dy > 0) 1352 if (dy > 0)
1112 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1113 else if (dy < 0) 1354 else if (dy < 0)
1114 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);
1115 1356
1116 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1117 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1118 1359
1119 while (self->y < 0) 1360 while (self->y < 0)
1124 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
1125 } 1366 }
1126} 1367}
1127 1368
1128void 1369void
1129map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
1130 CODE: 1371 CODE:
1131{ 1372{
1132 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1133 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1134 mapcell *cell; 1375 mapcell *cell;
1135 int x, y, flags; 1376 int x, y, flags;
1136 1377
1137 while (data < data_end) 1378 while (data < data_end - 1)
1138 { 1379 {
1139 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1140 1381
1141 x = ((flags >> 10) & 63) + self->x; 1382 x = self->x + ((flags >> 10) & 63);
1142 y = ((flags >> 4) & 63) + self->y; 1383 y = self->y + ((flags >> 4) & 63);
1143 1384
1144 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
1145 1386
1146 if (flags & 15) 1387 if (flags & 15)
1147 { 1388 {
1148 if (cell->darkness < 0) 1389 if (!cell->darkness)
1149 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1150 cell->darkness = 0; 1392 cell->darkness = 256;
1151 cell->face [0] = 0;
1152 cell->face [1] = 0;
1153 cell->face [2] = 0;
1154 } 1393 }
1155 1394
1156 cell->darkness = flags & 8 ? *data++ : 255;
1157
1158 //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)
1418 {
1419 if (*data == 8)
1420 ; // decode player uuid
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 }
1159 1436
1160 if (flags & 4) 1437 if (flags & 4)
1161 { 1438 {
1162 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;
1163 } 1440 }
1171 { 1448 {
1172 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;
1173 } 1450 }
1174 } 1451 }
1175 else 1452 else
1176 cell->darkness = -1; 1453 cell->darkness = 0;
1177 } 1454 }
1178} 1455}
1179 1456
1180SV * 1457SV *
1181mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1182 CODE: 1459 CODE:
1183{ 1460{
1184 int x1, x; 1461 int x1, x;
1185 int y1, y; 1462 int y1, y;
1186 int z; 1463 int z;
1236} 1513}
1237 OUTPUT: 1514 OUTPUT:
1238 RETVAL 1515 RETVAL
1239 1516
1240void 1517void
1241draw (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, int T)
1242 PPCODE: 1519 CODE:
1243{ 1520{
1244 int vx, vy;
1245 int x, y, z; 1521 int x, y, z;
1246 int last_name; 1522 int last_name;
1247 mapface face; 1523 mapface face;
1248 int sw4 = (sw + 3) & ~3;
1249 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1250 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1251
1252 memset (darkness, 255, sw4 * sh);
1253 SvPOK_only (darkness_sv);
1254 SvCUR_set (darkness_sv, sw4 * sh);
1255
1256 vx = self->x + (self->w - sw) / 2 - shift_x;
1257 vy = self->y + (self->h - sh) / 2 - shift_y;
1258
1259 /*
1260 int vx = self->vx = self->w >= sw
1261 ? self->x + (self->w - sw) / 2
1262 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1263
1264 int vy = self->vy = self->h >= sh
1265 ? self->y + (self->h - sh) / 2
1266 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1267 */
1268 1524
1269 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1270 1526
1527 glEnable (GL_BLEND);
1271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1272 glEnable (GL_BLEND);
1273 glEnable (GL_TEXTURE_2D); 1529 glEnable (GL_TEXTURE_2D);
1274 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1275 1531
1276 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1277 1533
1278 last_name = 0; 1534 last_name = 0;
1279 1535
1536 mx += self->x;
1537 my += self->y;
1538
1280 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1281 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1282 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1283 { 1542 {
1284 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1285 1544
1286 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1287 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1288 { 1547 {
1289 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1290
1291 darkness[y * sw4 + x] = cell->darkness < 0
1292 ? 255 - FOW_DARKNESS
1293 : 255 - cell->darkness;
1294 1549
1295 face = cell->face [z]; 1550 face = cell->face [z];
1296 1551
1297 if (face) 1552 if (face && face < self->texs)
1298 { 1553 {
1299 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1300
1301 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * T - tex.w;
1302 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * T - tex.h;
1303 1557
1304 if (last_name != tex.name) 1558 if (last_name != tex.name)
1305 { 1559 {
1306 glEnd (); 1560 glEnd ();
1307 last_name = tex.name;
1308 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1309 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1310 } 1563 }
1311 1564
1312 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1313 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1314 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);
1315 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1316 } 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) * T - tex.w + 2;
1577 int py = (y + 1) * T - 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 }
1317 } 1589 }
1318 } 1590 }
1319 1591
1320 glEnd (); 1592 glEnd ();
1321 1593
1322 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1323 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 * T;
1609 int py = y * T;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * T;
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 }
1324 1720
1325 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1326 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1327 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1328 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1329} 1725}
1330 1726
1331SV * 1727SV *
1332get_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)
1333 CODE: 1729 CODE:
1334{ 1730{
1335 int x, y, x1, y1; 1731 int x, y, x1, y1;
1336 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1337 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1399} 1795}
1400 OUTPUT: 1796 OUTPUT:
1401 RETVAL 1797 RETVAL
1402 1798
1403void 1799void
1404set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1405 PPCODE: 1801 PPCODE:
1406{ 1802{
1407 int x, y, z; 1803 int x, y, z;
1408 int w, h; 1804 int w, h;
1409 int x1, y1; 1805 int x1, y1;
1441 1837
1442 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1443 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1444 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1445 1841
1446 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1447 { 1843 {
1448 cell->darkness = -1; 1844 cell->darkness = 0;
1449 1845
1450 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1451 { 1847 {
1452 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1453 1849
1458 } 1854 }
1459 } 1855 }
1460 } 1856 }
1461} 1857}
1462 1858
1463MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1464 1860
1465CFClient::MixChunk 1861CFPlus::MixChunk
1466new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1467 CODE: 1863 CODE:
1468 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1469 OUTPUT: 1865 OUTPUT:
1470 RETVAL 1866 RETVAL
1471 1867
1472void 1868void
1473DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1474 CODE: 1870 CODE:
1475 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1476 1872
1477int 1873int
1478volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1479 CODE: 1875 CODE:
1480 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1481 OUTPUT: 1877 OUTPUT:
1482 RETVAL 1878 RETVAL
1483 1879
1484int 1880int
1485play (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)
1486 CODE: 1882 CODE:
1487 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1488 OUTPUT: 1884 OUTPUT:
1489 RETVAL 1885 RETVAL
1490 1886
1491MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1492 1888
1493int 1889int
1494volume (int volume = -1) 1890volume (int volume = -1)
1495 CODE: 1891 CODE:
1496 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1497 OUTPUT: 1893 OUTPUT:
1498 RETVAL 1894 RETVAL
1499 1895
1500CFClient::MixMusic 1896CFPlus::MixMusic
1501new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1502 CODE: 1898 CODE:
1503 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1504 OUTPUT: 1900 OUTPUT:
1505 RETVAL 1901 RETVAL
1506 1902
1507void 1903void
1508DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1509 CODE: 1905 CODE:
1510 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1511 1907
1512int 1908int
1513play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1514 CODE: 1910 CODE:
1515 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1516 OUTPUT: 1912 OUTPUT:
1517 RETVAL 1913 RETVAL
1518 1914
1519MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1520 1916
1521BOOT: 1917BOOT:
1522{ 1918{
1523 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1524 static const struct { 1920 static const struct {
1525 const char *name; 1921 const char *name;
1526 IV iv; 1922 IV iv;
1527 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1528# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
1535 const_iv (GL_SCISSOR_TEST), 1931 const_iv (GL_SCISSOR_TEST),
1536 const_iv (GL_DEPTH_TEST), 1932 const_iv (GL_DEPTH_TEST),
1537 const_iv (GL_ALPHA_TEST), 1933 const_iv (GL_ALPHA_TEST),
1538 const_iv (GL_NORMALIZE), 1934 const_iv (GL_NORMALIZE),
1539 const_iv (GL_RESCALE_NORMAL), 1935 const_iv (GL_RESCALE_NORMAL),
1936 const_iv (GL_FRONT),
1937 const_iv (GL_BACK),
1540 const_iv (GL_AND), 1938 const_iv (GL_AND),
1541 const_iv (GL_ONE), 1939 const_iv (GL_ONE),
1542 const_iv (GL_ZERO), 1940 const_iv (GL_ZERO),
1543 const_iv (GL_SRC_ALPHA), 1941 const_iv (GL_SRC_ALPHA),
1544 const_iv (GL_SRC_ALPHA_SATURATE), 1942 const_iv (GL_DST_ALPHA),
1545 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1943 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546 const_iv (GL_ONE_MINUS_DST_ALPHA), 1944 const_iv (GL_ONE_MINUS_DST_ALPHA),
1945 const_iv (GL_SRC_ALPHA_SATURATE),
1547 const_iv (GL_RGB), 1946 const_iv (GL_RGB),
1548 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),
1549 const_iv (GL_UNSIGNED_BYTE), 1951 const_iv (GL_UNSIGNED_BYTE),
1550 const_iv (GL_UNSIGNED_SHORT), 1952 const_iv (GL_UNSIGNED_SHORT),
1551 const_iv (GL_UNSIGNED_INT), 1953 const_iv (GL_UNSIGNED_INT),
1552 const_iv (GL_ALPHA), 1954 const_iv (GL_ALPHA),
1553 const_iv (GL_INTENSITY), 1955 const_iv (GL_INTENSITY),
1585 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1586 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1587 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1588 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1589 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1590 const_iv (GL_LINE_LOOP), 1993 const_iv (GL_LINE_LOOP),
1591 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1592 const_iv (GL_QUAD_STRIP), 1995 const_iv (GL_QUAD_STRIP),
1593 const_iv (GL_TRIANGLES), 1996 const_iv (GL_TRIANGLES),
1594 const_iv (GL_TRIANGLE_STRIP), 1997 const_iv (GL_TRIANGLE_STRIP),
1627 OUTPUT: 2030 OUTPUT:
1628 RETVAL 2031 RETVAL
1629 2032
1630int glGetError () 2033int glGetError ()
1631 2034
2035void glFinish ()
2036
1632void glClear (int mask) 2037void glClear (int mask)
1633 2038
1634void glClearColor (float r, float g, float b, float a = 1.0) 2039void glClearColor (float r, float g, float b, float a = 1.0)
1635 PROTOTYPE: @ 2040 PROTOTYPE: @
1636 2041
1642 2047
1643void glHint (int target, int mode) 2048void glHint (int target, int mode)
1644 2049
1645void glBlendFunc (int sfactor, int dfactor) 2050void glBlendFunc (int sfactor, int dfactor)
1646 2051
2052void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2053 CODE:
2054 gl_BlendFuncSeparate (sa, da, saa, daa);
2055
1647void glDepthMask (int flag) 2056void glDepthMask (int flag)
1648 2057
1649void glLogicOp (int opcode) 2058void glLogicOp (int opcode)
1650 2059
1651void glColorMask (int red, int green, int blue, int alpha) 2060void glColorMask (int red, int green, int blue, int alpha)
1655void glPushMatrix () 2064void glPushMatrix ()
1656 2065
1657void glPopMatrix () 2066void glPopMatrix ()
1658 2067
1659void glLoadIdentity () 2068void glLoadIdentity ()
2069
2070void glDrawBuffer (int buffer)
2071
2072void glReadBuffer (int buffer)
1660 2073
1661# near_ and far_ are due to microsofts buggy "c" compiler 2074# near_ and far_ are due to microsofts buggy "c" compiler
1662void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2075void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1663 2076
1664# near_ and far_ are due to microsofts buggy "c" compiler 2077# near_ and far_ are due to microsofts buggy "c" compiler
1684 2097
1685void glEnd () 2098void glEnd ()
1686 2099
1687void glColor (float r, float g, float b, float a = 1.0) 2100void glColor (float r, float g, float b, float a = 1.0)
1688 PROTOTYPE: @ 2101 PROTOTYPE: @
2102 ALIAS:
2103 glColor_premultiply = 1
1689 CODE: 2104 CODE:
2105 if (ix)
2106 {
2107 r *= a;
2108 g *= a;
2109 b *= a;
2110 }
1690 // microsoft visual "c" rounds instead of truncating... 2111 // microsoft visual "c" rounds instead of truncating...
1691 glColor4ub (MIN ((int)(r * 256.f), 255), 2112 glColor4f (r, g, b, a);
1692 MIN ((int)(g * 256.f), 255),
1693 MIN ((int)(b * 256.f), 255),
1694 MIN ((int)(a * 256.f), 255));
1695 2113
1696void glInterleavedArrays (int format, int stride, char *data) 2114void glInterleavedArrays (int format, int stride, char *data)
1697 2115
1698void glDrawElements (int mode, int count, int type, char *indices) 2116void glDrawElements (int mode, int count, int type, char *indices)
1699 2117
1722 2140
1723void glBindTexture (int target, int name) 2141void glBindTexture (int target, int name)
1724 2142
1725void glConvolutionParameter (int target, int pname, float params) 2143void glConvolutionParameter (int target, int pname, float params)
1726 CODE: 2144 CODE:
1727 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2145 if (gl.ConvolutionParameterf)
2146 gl.ConvolutionParameterf (target, pname, params);
1728 2147
1729void 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)
1730 CODE: 2149 CODE:
1731 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2150 if (gl.ConvolutionFilter2D)
1732 (target, internalformat, width, height, format, type, data)); 2151 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1733 2152
1734void 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)
1735 CODE: 2154 CODE:
1736 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2155 if (gl.SeparableFilter2D)
1737 (target, internalformat, width, height, format, type, row, column)); 2156 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1738 2157
1739void 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)
1740 2159
1741void 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)
1742 2161
1775 2194
1776void glEndList () 2195void glEndList ()
1777 2196
1778void glCallList (int list) 2197void glCallList (int list)
1779 2198
1780

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines