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.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.173 by root, Wed Apr 4 02:43:29 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>
15#include <stdlib.h> 23#include <stdlib.h>
16 24
18#include <SDL_endian.h> 26#include <SDL_endian.h>
19#include <SDL_image.h> 27#include <SDL_image.h>
20#include <SDL_mixer.h> 28#include <SDL_mixer.h>
21#include <SDL_opengl.h> 29#include <SDL_opengl.h>
22 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
23#include <glib/gmacros.h> 34#include <glib/gmacros.h>
24 35
25#include <pango/pango.h> 36#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 37
30#ifndef _WIN32 38#ifndef _WIN32
31# include <sys/types.h> 39# include <sys/types.h>
32# include <sys/socket.h> 40# include <sys/socket.h>
33# include <netinet/in.h> 41# include <netinet/in.h>
34# include <netinet/tcp.h> 42# include <netinet/tcp.h>
35# include <inttypes.h> 43# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 44#endif
44 45
45#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 47
47#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
48 49
49#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
51 52
52#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
53 60
54static struct 61static struct
55{ 62{
56#define GL_FUNC(ptr,name) ptr name; 63#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 64#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 74 else
68 glBlendFunc (sa, da); 75 glBlendFunc (sa, da);
69} 76}
70 77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
71typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
73 86
74typedef 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}
75 106
76typedef struct cf_layout { 107typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
80 int base_height; 110 int base_height;
81 CFClient__Font font; 111 CFPlus__Font font;
82} *CFClient__Layout; 112} *CFPlus__Layout;
83 113
84static CFClient__Font default_font; 114static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
87 117
88static void 118static void
89substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
90{ 120{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 122#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 124#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 126}
101 127
102static void 128static void
103layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
104{ 130{
105 /* 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
106 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
107 */ 133 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
112 138
113 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
114} 140}
115 141
116static void 142static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
120 149
121 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 152
124 *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;
125} 158}
126 159
127typedef uint16_t mapface; 160typedef uint16_t mapface;
128 161
129typedef struct { 162typedef struct {
132 float s, t; 165 float s, t;
133 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
134} maptex; 167} maptex;
135 168
136typedef struct { 169typedef struct {
137 int16_t darkness; 170 uint32_t player;
138 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
139} mapcell; 174} mapcell;
140 175
141typedef struct { 176typedef struct {
142 int32_t c0, c1; 177 int32_t c0, c1;
143 mapcell *col; 178 mapcell *col;
152 int texs; 187 int texs;
153 maptex *tex; 188 maptex *tex;
154 189
155 int32_t rows; 190 int32_t rows;
156 maprow *row; 191 maprow *row;
157} *CFClient__Map; 192} *CFPlus__Map;
158 193
159static char * 194static char *
160prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
161{ 196{
162 char *p; 197 char *p;
180 215
181#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))
182#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))
183 218
184static maprow * 219static maprow *
185map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
186{ 221{
187 if (0 > y) 222 if (0 > y)
188 { 223 {
189 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
228 263
229 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
230} 265}
231 266
232static mapcell * 267static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
234{ 269{
235 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
236} 271}
237 272
238static void 273static void
239map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
240{ 275{
241 int r; 276 int r;
242 277
243 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
252 self->row = 0; 287 self->row = 0;
253 self->rows = 0; 288 self->rows = 0;
254} 289}
255 290
256static void 291static void
257map_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)
258{ 293{
259 int x, y; 294 int x, y;
260 maprow *row; 295 maprow *row;
296 mapcell *cell;
261 297
262 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 299 if (y >= 0)
264 { 300 {
265 if (y >= self->rows) 301 if (y >= self->rows)
271 if (x >= row->c0) 307 if (x >= row->c0)
272 { 308 {
273 if (x >= row->c1) 309 if (x >= row->c1)
274 break; 310 break;
275 311
276 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;
277 } 318 }
278 } 319 }
279} 320}
280 321
281static void 322static void
302 ev.data2 = 0; 343 ev.data2 = 0;
303 344
304 SDL_PushEvent ((SDL_Event *)&ev); 345 SDL_PushEvent ((SDL_Event *)&ev);
305} 346}
306 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
307MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
308 370
309PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
310 372
311BOOT: 373BOOT:
312{ 374{
313 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
314 static const struct { 376 static const struct {
315 const char *name; 377 const char *name;
316 IV iv; 378 IV iv;
317 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
318# 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
319 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
320 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
321 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
322 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
323 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
332 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
333 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
334 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
335 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
336 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
337 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
338 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
339 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
340 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
341 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
396 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
397 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
398 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
399 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
400 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
401 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
402 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
403 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
404 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
405 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
406 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
407 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
408 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
409 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
410 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
411 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
412 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
413 const_iv (KMOD_CTRL),
414 const_iv (KMOD_SHIFT),
415 const_iv (KMOD_ALT),
416 const_iv (KMOD_META)
417# undef const_iv 488# undef const_iv
418 }; 489 };
419 490
420 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; )
421 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);
422} 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)
423 514
424void 515void
425pango_init () 516pango_init ()
426 CODE: 517 CODE:
427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{ 518{
429 {
430 ft2_fontmap = pango_ft2_font_map_new (); 519 opengl_fontmap = pango_opengl_font_map_new ();
431 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);
432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 521 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
436 cairo_fontmap = pango_cairo_font_map_get_default ();
437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
449} 522}
450 523
451int 524int
452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 525SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453 526
454void 527void
455SDL_Quit () 528SDL_Quit ()
456 529
457void 530void
464 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 537 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 538 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 539 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467 540
468 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 541 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 542 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470 543
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 544 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475 548
476 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
477 554
478 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
479 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480 557
481 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
533 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
534 case SDL_KEYUP: 611 case SDL_KEYUP:
535 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
536 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
537 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 */
538 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
539 break; 617 break;
540 618
541 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
542 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
568 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570 break; 648 break;
571 } 649 }
572 650
573 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574 } 652 }
575} 653}
576 654
577int 655int
578Mix_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)
592#ifndef _WIN32 670#ifndef _WIN32
593 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
594#endif 672#endif
595 673
596void 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
597add_font (char *file) 704add_font (char *file)
598 CODE: 705 CODE:
599 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600#ifdef _WIN32
601 // cairo... sigh... requires win2000
602 AddFontResourceEx (file, FR_PRIVATE, 0);
603#endif
604 707
605void 708void
606load_image_inline (SV *image_) 709load_image_inline (SV *image_)
607 ALIAS: 710 ALIAS:
608 load_image_file = 1 711 load_image_file = 1
650 753
651 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652 755
653 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
654 757
758 SDL_LockSurface (surface2);
655 EXTEND (SP, 5); 759 EXTEND (SP, 6);
656 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
657 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
658 SDL_LockSurface (surface2);
659 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660 SDL_UnlockSurface (surface2);
661 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)));
662 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
664 767
665 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
666 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
667} 770}
668 771
704 CODE: 807 CODE:
705 fprintf (stderr, "FATAL: %s\n", message); 808 fprintf (stderr, "FATAL: %s\n", message);
706#ifdef _WIN32 809#ifdef _WIN32
707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708#endif 811#endif
709 _Exit (1); 812 _exit (1);
710 813
711void 814void
712_exit (int retval) 815_exit (int retval = 0)
713 CODE: 816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
714 _Exit (retval); 820 _exit (retval);
821#endif
715 822
716MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
717 824
718CFClient::Font 825CFPlus::Font
719new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
720 CODE: 827 CODE:
721{ 828{
722 int count; 829 int count;
723 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
726} 833}
727 OUTPUT: 834 OUTPUT:
728 RETVAL 835 RETVAL
729 836
730void 837void
731DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
732 CODE: 839 CODE:
733 pango_font_description_free (self); 840 pango_font_description_free (self);
734 841
735void 842void
736make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
737 CODE: 844 CODE:
738 default_font = self; 845 default_font = self;
739 846
740MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
741 848
742CFClient::Layout 849void
743new (SV *class, int rgba = 0) 850reset_glyph_cache ()
851 CODE:
852 tc_clear ();
853
854CFPlus::Layout
855new (SV *class)
744 CODE: 856 CODE:
745 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
746 858
747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 859 RETVAL->pl = pango_layout_new (opengl_context);
748 RETVAL->rgba = rgba;
749 RETVAL->r = 1.; 860 RETVAL->r = 1.;
750 RETVAL->g = 1.; 861 RETVAL->g = 1.;
751 RETVAL->b = 1.; 862 RETVAL->b = 1.;
752 RETVAL->a = 1.; 863 RETVAL->a = 1.;
753 RETVAL->base_height = MIN_FONT_HEIGHT; 864 RETVAL->base_height = MIN_FONT_HEIGHT;
757 layout_update_font (RETVAL); 868 layout_update_font (RETVAL);
758 OUTPUT: 869 OUTPUT:
759 RETVAL 870 RETVAL
760 871
761void 872void
762DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
763 CODE: 874 CODE:
764 g_object_unref (self->pl); 875 g_object_unref (self->pl);
765 Safefree (self); 876 Safefree (self);
766 877
767int
768is_rgba (CFClient::Layout self)
769 CODE:
770 RETVAL = self->rgba;
771 OUTPUT:
772 RETVAL
773
774void 878void
775set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
776 CODE: 880 CODE:
777{ 881{
778 STRLEN textlen; 882 STRLEN textlen;
779 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
780 884
781 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
782} 886}
783 887
784void 888void
785set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
786 CODE: 890 CODE:
787{ 891{
788 STRLEN textlen; 892 STRLEN textlen;
789 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
790 894
791 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
792} 896}
793 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
794SV * 983SV *
795get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
796 CODE: 985 CODE:
797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798 sv_utf8_decode (RETVAL); 987 sv_utf8_decode (RETVAL);
799 OUTPUT: 988 OUTPUT:
800 RETVAL 989 RETVAL
801 990
802void 991void
803set_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.)
804 CODE: 993 CODE:
805 self->r = r; 994 self->r = r;
806 self->g = g; 995 self->g = g;
807 self->b = b; 996 self->b = b;
808 self->a = a; 997 self->a = a;
809 998
810void 999void
811set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812 CODE: 1001 CODE:
813 if (self->font != font) 1002 if (self->font != font)
814 { 1003 {
815 self->font = font; 1004 self->font = font;
816 layout_update_font (self); 1005 layout_update_font (self);
817 } 1006 }
818 1007
819void 1008void
820set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
821 CODE: 1010 CODE:
822 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
823 { 1012 {
824 self->base_height = base_height; 1013 self->base_height = base_height;
825 layout_update_font (self); 1014 layout_update_font (self);
826 } 1015 }
827 1016
828void 1017void
829set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
830 CODE: 1019 CODE:
831 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);
832 1021
833void 1022void
834set_indent (CFClient::Layout self, int indent) 1023set_indent (CFPlus::Layout self, int indent)
835 CODE: 1024 CODE:
836 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837 1026
838void 1027void
839set_spacing (CFClient::Layout self, int spacing) 1028set_spacing (CFPlus::Layout self, int spacing)
840 CODE: 1029 CODE:
841 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842 1031
843void 1032void
844set_ellipsise (CFClient::Layout self, int ellipsise) 1033set_ellipsise (CFPlus::Layout self, int ellipsise)
845 CODE: 1034 CODE:
846 pango_layout_set_ellipsize (self->pl, 1035 pango_layout_set_ellipsize (self->pl,
847 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
848 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
850 : PANGO_ELLIPSIZE_NONE 1039 : PANGO_ELLIPSIZE_NONE
851 ); 1040 );
852 1041
853void 1042void
854set_single_paragraph_mode (CFClient::Layout self, int spm) 1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
855 CODE: 1044 CODE:
856 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857 1046
858void 1047void
859size (CFClient::Layout self) 1048size (CFPlus::Layout self)
860 PPCODE: 1049 PPCODE:
861{ 1050{
862 int w, h; 1051 int w, h;
863 1052
864 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
867 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
868 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
869} 1058}
870 1059
871int 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
872xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
873 CODE: 1074 CODE:
874{ 1075{
875 int index, trailing; 1076 int index, trailing;
876 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);
877 RETVAL = index; 1078 RETVAL = index + trailing;
878} 1079}
879 OUTPUT: 1080 OUTPUT:
880 RETVAL 1081 RETVAL
881 1082
882void 1083void
883cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
884 PPCODE: 1085 PPCODE:
885{ 1086{
886 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
887 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888 1089
891 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893} 1094}
894 1095
895void 1096void
896render (CFClient::Layout self) 1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
897 PPCODE: 1098 PPCODE:
898{ 1099{
899 SV *retval; 1100 int line, x;
900 int w, h;
901 1101
902 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 */
903 1104
904 if (self->rgba)
905 {
906 cairo_surface_t *surface;
907 cairo_t *cairo;
908
909 retval = newSV (w * h * 4);
910 SvPOK_only (retval);
911 SvCUR_set (retval, w * h * 4);
912
913 memset (SvPVX (retval), 0, w * h * 4);
914
915 surface = cairo_image_surface_create_for_data (
916 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917 cairo = cairo_create (surface);
918 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920 pango_cairo_show_layout (cairo, self->pl);
921
922 cairo_destroy (cairo);
923 cairo_surface_destroy (surface);
924
925 // what a mess, and its premultiplied, too :(
926 {
927 uint32_t *p = (uint32_t *)SvPVX (retval);
928 uint32_t *e = p + w * h;
929
930 while (p < e)
931 {
932 uint32_t rgba = *p;
933 rgba = (rgba >> 24) | (rgba << 8);
934#if 0
935#ifdef _WIN32
936 {//D
937 uint8_t r = rgba >> 24;
938 uint8_t g = rgba >> 16;
939 uint8_t b = rgba >> 8;
940 uint8_t a = rgba >> 0;
941
942 rgba = (rgba & 0xffffff00) | a;
943 }
944#endif
945#endif
946 rgba = SDL_SwapBE32 (rgba);
947 *p++ = rgba;
948 }
949 }
950
951 EXTEND (SP, 5); 1105 EXTEND (SP, 2);
952 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)
953 PUSHs (sv_2mortal (newSViv (h))); 1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
954 PUSHs (sv_2mortal (retval));
955 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957 }
958 else 1128 else
959 { 1129 {
960 FT_Bitmap bitmap;
961
962 retval = newSV (w * h);
963 SvPOK_only (retval);
964 SvCUR_set (retval, w * h);
965
966 bitmap.rows = h;
967 bitmap.width = w;
968 bitmap.pitch = w;
969 bitmap.buffer = (unsigned char*)SvPVX (retval);
970 bitmap.num_grays = 256;
971 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973 memset (bitmap.buffer, 0, w * h);
974
975 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977 EXTEND (SP, 5);
978 PUSHs (sv_2mortal (newSViv (w))); 1130 PUSHs (sv_2mortal (newSViv (index)));
979 PUSHs (sv_2mortal (newSViv (h))); 1131 PUSHs (sv_2mortal (newSViv (trailing)));
980 PUSHs (sv_2mortal (retval));
981 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983 } 1132 }
984} 1133}
985 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
986MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
987 1146
988void 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
989draw_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.)
990 PROTOTYPE: $$$;$$ 1186 PROTOTYPE: $$$;$$
991 ALIAS: 1187 ALIAS:
992 draw_quad_alpha = 1 1188 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1189 draw_quad_alpha_premultiplied = 2
994 CODE: 1190 CODE:
1032 glDisable (GL_ALPHA_TEST); 1228 glDisable (GL_ALPHA_TEST);
1033 glDisable (GL_BLEND); 1229 glDisable (GL_BLEND);
1034 } 1230 }
1035} 1231}
1036 1232
1037MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1038 1234
1039CFClient::Map 1235CFPlus::Map
1040new (SV *class, int map_width, int map_height) 1236new (SV *class)
1041 CODE: 1237 CODE:
1042 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1043 RETVAL->x = 0; 1239 RETVAL->x = 0;
1044 RETVAL->y = 0; 1240 RETVAL->y = 0;
1045 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1046 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1047 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1048 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1049 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1050 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1051 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
1054 RETVAL->row = 0; 1250 RETVAL->row = 0;
1055 OUTPUT: 1251 OUTPUT:
1056 RETVAL 1252 RETVAL
1057 1253
1058void 1254void
1059DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
1060 CODE: 1256 CODE:
1061{ 1257{
1062 map_clear (self); 1258 map_clear (self);
1063 Safefree (self->face); 1259 Safefree (self->face);
1064 Safefree (self->tex); 1260 Safefree (self->tex);
1065 Safefree (self); 1261 Safefree (self);
1066} 1262}
1067 1263
1068void 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
1069clear (CFClient::Map self) 1271clear (CFPlus::Map self)
1070 CODE: 1272 CODE:
1071 map_clear (self); 1273 map_clear (self);
1072 1274
1073void 1275void
1074set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
1075 CODE: 1277 CODE:
1076{ 1278{
1077 while (self->faces <= face) 1279 while (self->faces <= face)
1078 { 1280 {
1079 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
1082 1284
1083 self->face [face] = texid; 1285 self->face [face] = texid;
1084} 1286}
1085 1287
1086void 1288void
1087set_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)
1088 CODE: 1290 CODE:
1089{ 1291{
1090 while (self->texs <= texid) 1292 while (self->texs <= texid)
1091 { 1293 {
1092 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
1116 // from transparent color bleeding and ugly wrapping effects. 1318 // from transparent color bleeding and ugly wrapping effects.
1117 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118} 1320}
1119 1321
1120int 1322int
1121ox (CFClient::Map self) 1323ox (CFPlus::Map self)
1122 ALIAS: 1324 ALIAS:
1123 oy = 1 1325 oy = 1
1124 x = 2 1326 x = 2
1125 y = 3 1327 y = 3
1126 w = 4 1328 w = 4
1137 } 1339 }
1138 OUTPUT: 1340 OUTPUT:
1139 RETVAL 1341 RETVAL
1140 1342
1141void 1343void
1142scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1143 CODE: 1345 CODE:
1144{ 1346{
1145 if (dx > 0) 1347 if (dx > 0)
1146 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1147 else if (dx < 0) 1349 else if (dx < 0)
1148 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);
1149 1351
1150 if (dy > 0) 1352 if (dy > 0)
1151 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1152 else if (dy < 0) 1354 else if (dy < 0)
1153 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);
1154 1356
1155 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1156 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1157 1359
1158 while (self->y < 0) 1360 while (self->y < 0)
1163 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
1164 } 1366 }
1165} 1367}
1166 1368
1167void 1369void
1168map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169 CODE: 1371 CODE:
1170{ 1372{
1171 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1173 mapcell *cell; 1375 mapcell *cell;
1174 int x, y, flags; 1376 int x, y, flags;
1175 1377
1176 while (data < data_end) 1378 while (data < data_end - 1)
1177 { 1379 {
1178 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1179 1381
1180 x = ((flags >> 10) & 63) + self->x; 1382 x = self->x + ((flags >> 10) & 63);
1181 y = ((flags >> 4) & 63) + self->y; 1383 y = self->y + ((flags >> 4) & 63);
1182 1384
1183 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
1184 1386
1185 if (flags & 15) 1387 if (flags & 15)
1186 { 1388 {
1187 if (cell->darkness < 0) 1389 if (!cell->darkness)
1188 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1189 cell->darkness = 0; 1392 cell->darkness = 256;
1190 cell->face [0] = 0;
1191 cell->face [1] = 0;
1192 cell->face [2] = 0;
1193 } 1393 }
1194 1394
1195 cell->darkness = flags & 8 ? *data++ : 255;
1196
1197 //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 }
1198 1436
1199 if (flags & 4) 1437 if (flags & 4)
1200 { 1438 {
1201 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;
1202 } 1440 }
1210 { 1448 {
1211 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;
1212 } 1450 }
1213 } 1451 }
1214 else 1452 else
1215 cell->darkness = -1; 1453 cell->darkness = 0;
1216 } 1454 }
1217} 1455}
1218 1456
1219SV * 1457SV *
1220mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221 CODE: 1459 CODE:
1222{ 1460{
1223 int x1, x; 1461 int x1, x;
1224 int y1, y; 1462 int y1, y;
1225 int z; 1463 int z;
1248 1486
1249 for (z = 0; z <= 0; z++) 1487 for (z = 0; z <= 0; z++)
1250 { 1488 {
1251 mapface face = cell->face [z]; 1489 mapface face = cell->face [z];
1252 1490
1253 if (face) 1491 if (face > 0 && face < self->texs)
1254 { 1492 {
1255 maptex tex = self->tex [face]; 1493 maptex tex = self->tex [face];
1256 int a0 = 255 - tex.a; 1494 int a0 = 255 - tex.a;
1257 int a1 = tex.a; 1495 int a1 = tex.a;
1258 1496
1275} 1513}
1276 OUTPUT: 1514 OUTPUT:
1277 RETVAL 1515 RETVAL
1278 1516
1279void 1517void
1280draw (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)
1281 PPCODE: 1519 CODE:
1282{ 1520{
1283 int vx, vy;
1284 int x, y, z; 1521 int x, y, z;
1285 int last_name; 1522 int last_name;
1286 mapface face; 1523 mapface face;
1287 int sw4 = (sw + 3) & ~3;
1288 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290
1291 memset (darkness, 255, sw4 * sh);
1292 SvPOK_only (darkness_sv);
1293 SvCUR_set (darkness_sv, sw4 * sh);
1294
1295 vx = self->x + (self->w - sw) / 2 - shift_x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y;
1297
1298 /*
1299 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2
1301 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1302
1303 int vy = self->vy = self->h >= sh
1304 ? self->y + (self->h - sh) / 2
1305 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306 */
1307 1524
1308 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1309 1526
1527 glEnable (GL_BLEND);
1310 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311 glEnable (GL_BLEND);
1312 glEnable (GL_TEXTURE_2D); 1529 glEnable (GL_TEXTURE_2D);
1313 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314 1531
1315 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1316 1533
1317 last_name = 0; 1534 last_name = 0;
1318 1535
1536 mx += self->x;
1537 my += self->y;
1538
1319 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1320 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1321 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1322 { 1542 {
1323 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1324 1544
1325 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1327 { 1547 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1329
1330 darkness[y * sw4 + x] = cell->darkness < 0
1331 ? 255 - FOW_DARKNESS
1332 : 255 - cell->darkness;
1333 1549
1334 face = cell->face [z]; 1550 face = cell->face [z];
1335 1551
1336 if (face) 1552 if (face > 0 && face < self->texs)
1337 { 1553 {
1338 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1339
1340 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * T - tex.w;
1341 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * T - tex.h;
1342 1557
1343 if (last_name != tex.name) 1558 if (last_name != tex.name)
1344 { 1559 {
1345 glEnd (); 1560 glEnd ();
1346 last_name = tex.name;
1347 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1348 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1349 } 1563 }
1350 1564
1351 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353 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);
1354 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1355 } 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 }
1356 } 1589 }
1357 } 1590 }
1358 1591
1359 glEnd (); 1592 glEnd ();
1360 1593
1361 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1362 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 * T / 32) / 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 }
1363 1720
1364 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1368} 1725}
1369 1726
1370SV * 1727SV *
1371get_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)
1372 CODE: 1729 CODE:
1373{ 1730{
1374 int x, y, x1, y1; 1731 int x, y, x1, y1;
1375 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1376 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1438} 1795}
1439 OUTPUT: 1796 OUTPUT:
1440 RETVAL 1797 RETVAL
1441 1798
1442void 1799void
1443set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444 PPCODE: 1801 PPCODE:
1445{ 1802{
1446 int x, y, z; 1803 int x, y, z;
1447 int w, h; 1804 int w, h;
1448 int x1, y1; 1805 int x1, y1;
1480 1837
1481 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1482 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1483 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1484 1841
1485 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1486 { 1843 {
1487 cell->darkness = -1; 1844 cell->darkness = 0;
1488 1845
1489 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1490 { 1847 {
1491 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1492 1849
1497 } 1854 }
1498 } 1855 }
1499 } 1856 }
1500} 1857}
1501 1858
1502MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503 1860
1504CFClient::MixChunk 1861CFPlus::MixChunk
1505new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1506 CODE: 1863 CODE:
1507 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1508 OUTPUT: 1865 OUTPUT:
1509 RETVAL 1866 RETVAL
1510 1867
1511void 1868void
1512DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1513 CODE: 1870 CODE:
1514 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1515 1872
1516int 1873int
1517volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1518 CODE: 1875 CODE:
1519 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1520 OUTPUT: 1877 OUTPUT:
1521 RETVAL 1878 RETVAL
1522 1879
1523int 1880int
1524play (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)
1525 CODE: 1882 CODE:
1526 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527 OUTPUT: 1884 OUTPUT:
1528 RETVAL 1885 RETVAL
1529 1886
1530MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531 1888
1532int 1889int
1533volume (int volume = -1) 1890volume (int volume = -1)
1534 CODE: 1891 CODE:
1535 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1536 OUTPUT: 1893 OUTPUT:
1537 RETVAL 1894 RETVAL
1538 1895
1539CFClient::MixMusic 1896CFPlus::MixMusic
1540new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1541 CODE: 1898 CODE:
1542 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1543 OUTPUT: 1900 OUTPUT:
1544 RETVAL 1901 RETVAL
1545 1902
1546void 1903void
1547DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1548 CODE: 1905 CODE:
1549 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1550 1907
1551int 1908int
1552play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1553 CODE: 1910 CODE:
1554 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1555 OUTPUT: 1912 OUTPUT:
1556 RETVAL 1913 RETVAL
1557 1914
1558MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559 1916
1560BOOT: 1917BOOT:
1561{ 1918{
1562 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563 static const struct { 1920 static const struct {
1564 const char *name; 1921 const char *name;
1565 IV iv; 1922 IV iv;
1566 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1567# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
1574 const_iv (GL_SCISSOR_TEST), 1931 const_iv (GL_SCISSOR_TEST),
1575 const_iv (GL_DEPTH_TEST), 1932 const_iv (GL_DEPTH_TEST),
1576 const_iv (GL_ALPHA_TEST), 1933 const_iv (GL_ALPHA_TEST),
1577 const_iv (GL_NORMALIZE), 1934 const_iv (GL_NORMALIZE),
1578 const_iv (GL_RESCALE_NORMAL), 1935 const_iv (GL_RESCALE_NORMAL),
1936 const_iv (GL_FRONT),
1937 const_iv (GL_BACK),
1579 const_iv (GL_AND), 1938 const_iv (GL_AND),
1580 const_iv (GL_ONE), 1939 const_iv (GL_ONE),
1581 const_iv (GL_ZERO), 1940 const_iv (GL_ZERO),
1582 const_iv (GL_SRC_ALPHA), 1941 const_iv (GL_SRC_ALPHA),
1583 const_iv (GL_DST_ALPHA), 1942 const_iv (GL_DST_ALPHA),
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1943 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 1944 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 1945 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 1946 const_iv (GL_RGB),
1588 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),
1589 const_iv (GL_UNSIGNED_BYTE), 1951 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 1952 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 1953 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 1954 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 1955 const_iv (GL_INTENSITY),
1625 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1626 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1627 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1628 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1629 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1630 const_iv (GL_LINE_LOOP), 1993 const_iv (GL_LINE_LOOP),
1631 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1632 const_iv (GL_QUAD_STRIP), 1995 const_iv (GL_QUAD_STRIP),
1633 const_iv (GL_TRIANGLES), 1996 const_iv (GL_TRIANGLES),
1634 const_iv (GL_TRIANGLE_STRIP), 1997 const_iv (GL_TRIANGLE_STRIP),
1667 OUTPUT: 2030 OUTPUT:
1668 RETVAL 2031 RETVAL
1669 2032
1670int glGetError () 2033int glGetError ()
1671 2034
2035void glFinish ()
2036
1672void glClear (int mask) 2037void glClear (int mask)
1673 2038
1674void glClearColor (float r, float g, float b, float a = 1.0) 2039void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 2040 PROTOTYPE: @
1676 2041
1699void glPushMatrix () 2064void glPushMatrix ()
1700 2065
1701void glPopMatrix () 2066void glPopMatrix ()
1702 2067
1703void glLoadIdentity () 2068void glLoadIdentity ()
2069
2070void glDrawBuffer (int buffer)
2071
2072void glReadBuffer (int buffer)
1704 2073
1705# near_ and far_ are due to microsofts buggy "c" compiler 2074# near_ and far_ are due to microsofts buggy "c" compiler
1706void 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_)
1707 2076
1708# near_ and far_ are due to microsofts buggy "c" compiler 2077# near_ and far_ are due to microsofts buggy "c" compiler
1738 r *= a; 2107 r *= a;
1739 g *= a; 2108 g *= a;
1740 b *= a; 2109 b *= a;
1741 } 2110 }
1742 // microsoft visual "c" rounds instead of truncating... 2111 // microsoft visual "c" rounds instead of truncating...
1743 glColor4ub (MIN ((int)(r * 256.f), 255), 2112 glColor4f (r, g, b, a);
1744 MIN ((int)(g * 256.f), 255),
1745 MIN ((int)(b * 256.f), 255),
1746 MIN ((int)(a * 256.f), 255));
1747 2113
1748void glInterleavedArrays (int format, int stride, char *data) 2114void glInterleavedArrays (int format, int stride, char *data)
1749 2115
1750void glDrawElements (int mode, int count, int type, char *indices) 2116void glDrawElements (int mode, int count, int type, char *indices)
1751 2117
1828 2194
1829void glEndList () 2195void glEndList ()
1830 2196
1831void glCallList (int list) 2197void glCallList (int list)
1832 2198
1833

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines